From 9dce654359243ab294ff476418c67289b0ee37bf Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 24 Feb 2011 22:59:10 -0500
Subject: [PATCH] Yet another fix for GL sharing.
---
src/wrapper/wrap_cl.hpp | 8 ++++----
src/wrapper/wrap_cl_part_2.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/wrapper/wrap_cl.hpp b/src/wrapper/wrap_cl.hpp
index 8df73a23..6626425d 100644
--- a/src/wrapper/wrap_cl.hpp
+++ b/src/wrapper/wrap_cl.hpp
@@ -18,10 +18,6 @@
#else
-#if defined(cl_khr_gl_sharing) && (cl_khr_gl_sharing >= 1)
-#define PYOPENCL_GL_SHARING_VERSION cl_khr_gl_sharing
-#endif
-
// elsewhere ------------------------------------------------------------------
#include <CL/cl.h>
// TBD: Nvidia used to not install cl_ext.h by default. Grr.
@@ -37,6 +33,10 @@
#include <CL/cl_gl.h>
#endif
+#if defined(cl_khr_gl_sharing) && (cl_khr_gl_sharing >= 1)
+#define PYOPENCL_GL_SHARING_VERSION cl_khr_gl_sharing
+#endif
+
#endif
#include <stdexcept>
diff --git a/src/wrapper/wrap_cl_part_2.cpp b/src/wrapper/wrap_cl_part_2.cpp
index 899db5b8..e8457f37 100644
--- a/src/wrapper/wrap_cl_part_2.cpp
+++ b/src/wrapper/wrap_cl_part_2.cpp
@@ -234,7 +234,7 @@ void pyopencl_expose_part_2()
),
py::return_value_policy<py::manage_new_object>());
-#if defined(cl_khr_gl_sharing) && (cl_khr_gl_sharing >= 1)
+#if defined(PYOPENCL_GL_SHARING_VERSION) && (PYOPENCL_GL_SHARING_VERSION >= 1)
py::def("get_gl_context_info_khr", get_gl_context_info_khr,
py::args("properties", "param_name"));
#endif
--
GitLab