From d2a3c8c0e1a557430ab5ee7f1f13b1971b86e922 Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Tue, 9 Jul 2013 14:10:13 +0000
Subject: [PATCH] remove CL_VERSION_1_2 checks (see issue #123)
---
.../src/cpp/runKernel/Aparapi.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/com.amd.aparapi.jni/src/cpp/runKernel/Aparapi.cpp b/com.amd.aparapi.jni/src/cpp/runKernel/Aparapi.cpp
index de56ac98..920645fd 100644
--- a/com.amd.aparapi.jni/src/cpp/runKernel/Aparapi.cpp
+++ b/com.amd.aparapi.jni/src/cpp/runKernel/Aparapi.cpp
@@ -55,15 +55,21 @@
/**
* calls either clEnqueueMarker or clEnqueueMarkerWithWaitList
* depending on the version of OpenCL installed.
- * conveiniece function so we don't have to have #ifdefs all over the code
+ * convenience function so we don't have to have #ifdefs all over the code
+ *
+ * Actually I backed this out (Gary) when issue #123 was reported. This involved
+ * a build on a 1.2 compatible platform which failed on a platform with a 1.1 runtime.
+ * Failed to link.
+ * The answer is to set -DCL_USE_DEPRECATED_OPENCL_1_1_APIS at compile time and *not* use
+ * the CL_VERSION_1_2 ifdef.
*/
int enqueueMarker(cl_command_queue commandQueue, cl_event* firstEvent) {
-#ifdef CL_VERSION_1_2
- return clEnqueueMarkerWithWaitList(commandQueue, 0, NULL, firstEvent);
-#else
- // this was deprecated in 1.1
+//#ifdef CL_VERSION_1_2
+// return clEnqueueMarkerWithWaitList(commandQueue, 0, NULL, firstEvent);
+//#else
+ // this was deprecated in 1.1 make sure we use -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
return clEnqueueMarker(commandQueue, firstEvent);
-#endif
+//#endif
}
/**
--
GitLab