VENDOR_INTEL -> DEVICE_VENDOR_INTEL

brichard19 · Feb 8, 2019 · 18bdfb1 · 18bdfb1
1 parent a32ba51
commit 18bdfb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/clUtil/clContext.cpp b/clUtil/clContext.cpp
@@ -88,8 +88,8 @@ cl::CLProgram::CLProgram(cl::CLContext &ctx, std::string srcFile, std::string op
     size_t len = src.length();
     cl_int err;
 
-    if(util::toLower(_ctx.getDeviceVendor()) == "intel") {
-        options += "-DVENDOR_INTEL";
+    if(util::toLower(_ctx.getDeviceVendor()).find("intel") != std::string::npos) {
+        options += "-DDEVICE_VENDOR_INTEL";
     }
 
     _prog = clCreateProgramWithSource(ctx.getContext(), 1, &ptr, &len, &err);
@@ -117,8 +117,8 @@ cl::CLProgram::CLProgram(cl::CLContext &ctx, const char *src, std::string option
     size_t len = strlen(src);
     cl_int err;
 
-    if(util::toLower(_ctx.getDeviceVendor()) == "intel") {
-        options += "-DVENDOR_INTEL";
+    if(util::toLower(_ctx.getDeviceVendor()).find("intel") != std::string::npos) {
+        options += "-DDEVICE_VENDOR_INTEL";
     }
 
     _prog = clCreateProgramWithSource(ctx.getContext(), 1, &src, &len, &err);

diff --git a/clUtil/clutil.h b/clUtil/clutil.h
@@ -1,7 +1,13 @@
 #ifndef _CL_UTIL_H
 #define _CL_UTIL_H
 
+#ifdef __APPLE__
+#define CL_SILENCE_DEPRECATION
+#include <OpenCL/opencl.h>
+#else
 #include <CL/cl.h>
+#endif
+
 #include <string>
 #include <vector>