playing around with opencl versions

libmandel/include/ClGenerators.h

@@ -6,15 +6,25 @@
 #include "Generators.h"
 #include "OpenClCode.h"
 
+#ifdef __APPLE__
+#define CL_TARGET_OPENCL_VERSION 120
+#define CL_HPP_TARGET_OPENCL_VERSION 120
+#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#else
 #define CL_TARGET_OPENCL_VERSION 120
 #define CL_HPP_TARGET_OPENCL_VERSION 120
 #define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#endif
 
+#ifdef WITH_OPENCL
 #ifdef __APPLE__
 #include <OpenCL/cl.hpp>
 #else
 #include <CL/cl2.hpp>
 #endif
+#endif
+
+
 
 namespace mnd
 {

libmandel/include/OpenClInternal.h

@@ -1,9 +1,15 @@
 #ifndef MANDEL_OPENCLINTERNAL_H
 #define MANDEL_OPENCLINTERNAL_H
 
+#ifdef __APPLE__
+#define CL_TARGET_OPENCL_VERSION 120
+#define CL_HPP_TARGET_OPENCL_VERSION 120
+#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#else
 #define CL_TARGET_OPENCL_VERSION 120
 #define CL_HPP_TARGET_OPENCL_VERSION 120
 #define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#endif
 
 #ifdef WITH_OPENCL
 #ifdef __APPLE__

libmandel/src/ClGenerators.cpp

@@ -3,7 +3,9 @@
 #include "OpenClInternal.h"
 #include "OpenClCode.h"
 
-#ifdef WITH_OPENCL
+#include <CL/cl2.hpp>
+
+#if WITH_OPENCL
 
 #include <iostream>
 #include <iterator>
@@ -79,7 +81,32 @@ ClGenerator::ClGenerator(mnd::MandelDevice& device, const std::string& source, m
         throw std::string(program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(dev));
     }
 
+#if CL_HPP_TARGET_OPENCL_VERSION >= 200
+    /*cl_queue_properties qcp[] {
+        CL_QUEUE_PROPERTIES, 0,
+//        CL_QUEUE_PRIORITY_KHR, CL_QUEUE_PRIORITY_LOW_KHR,
+        0
+    };
+    int err = 0;
+    cl_command_queue dq = clCreateCommandQueueWithProperties(
+        this->context.get(),
+        dev.get(),
+        qcp,
+        &err
+    );
+    if (err == CL_SUCCESS) {
+        printf("queue success\n");
+        queue = CommandQueue(dq);
+    }
+    else {
+        printf("queue non-success\n");
+        queue = CommandQueue(context, dev);
+    }
+    */
+    queue = CommandQueue(context, dev);
+#else
     queue = CommandQueue(context, dev);
+#endif
 
     /*Platform p = getPlatform();
     device = getDevice(p, 0, true);