From 6fcc61f2cd67e57ad331b1ea22e1706e54ed9779 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 24 Feb 2011 11:02:20 -0500
Subject: [PATCH] Re-fix OpenCL GL interop.
---
src/wrapper/wrap_cl.hpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/wrapper/wrap_cl.hpp b/src/wrapper/wrap_cl.hpp
index 60edadd3..5c066827 100644
--- a/src/wrapper/wrap_cl.hpp
+++ b/src/wrapper/wrap_cl.hpp
@@ -727,10 +727,10 @@ namespace pyopencl
|| prop == CL_EGL_DISPLAY_KHR
|| prop == CL_GLX_DISPLAY_KHR
|| prop == CL_CGL_SHAREGROUP_KHR
- )
-#elif defined(__APPLE__) && defined(HAVE_GL)
- else if(prop == CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE)
+#if defined(__APPLE__) && defined(HAVE_GL)
+ || prop == CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE
#endif
+ )
{
py::object ctypes = py::import("ctypes");
py::object prop = prop_tuple[1], c_void_p = ctypes.attr("c_void_p");
@@ -738,6 +738,7 @@ namespace pyopencl
py::extract<cl_context_properties> value(ptr.attr("value"));
props.push_back(value);
}
+#endif
else
throw error("Context", CL_INVALID_VALUE, "invalid context property");
}
--
GitLab