Merge pull request #425 from kylelutz/opengl-osx

Add support for OpenCL-OpenCL sharing on Mac OS X

Author: kylelutz

example/CMakeLists.txt

@@ -86,7 +86,12 @@ if(${BOOST_COMPUTE_HAVE_VTK})
   find_package(VTK REQUIRED)
   include(${VTK_USE_FILE})
   add_executable(opengl_sphere opengl_sphere.cpp)
-  target_link_libraries(opengl_sphere ${OPENCL_LIBRARIES} ${Boost_LIBRARIES} ${VTK_LIBRARIES} GL)
+  target_link_libraries(opengl_sphere ${OPENCL_LIBRARIES} ${Boost_LIBRARIES} ${VTK_LIBRARIES})
+  if(APPLE)
+    target_link_libraries(opengl_sphere "-framework OpenGL")
+  elseif(UNIX)
+    target_link_libraries(opengl_sphere GL)
+  endif()
 endif()
 
 # qt examples
@@ -134,6 +139,11 @@ if(${BOOST_COMPUTE_HAVE_QT})
   )
   foreach(EXAMPLE ${QT_OPENGL_EXAMPLES})
     add_executable(${EXAMPLE} ${EXAMPLE}.cpp)
-    target_link_libraries(${EXAMPLE} ${OPENCL_LIBRARIES} ${Boost_LIBRARIES} ${QT_LIBRARIES} GL)
+    target_link_libraries(${EXAMPLE} ${OPENCL_LIBRARIES} ${Boost_LIBRARIES} ${QT_LIBRARIES})
+    if(APPLE)
+      target_link_libraries(${EXAMPLE} "-framework OpenGL")
+    elseif(UNIX)
+      target_link_libraries(${EXAMPLE} GL)
+    endif()
   endforeach()
 endif()

example/mandelbrot.cpp

@@ -127,6 +127,10 @@ void MandelbrotWidget::initializeGL()
 
 void MandelbrotWidget::resizeGL(int width, int height)
 {
+    // scale height/width based on device pixel ratio
+    width /= windowHandle()->devicePixelRatio();
+    height /= windowHandle()->devicePixelRatio();
+
     // resize viewport
     glViewport(0, 0, width, height);
 

example/nbody.cpp

@@ -11,8 +11,13 @@
 #include <iostream>
 
 #define GL_GLEXT_PROTOTYPES
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#else
 #include <GL/gl.h>
 #include <GL/glext.h>
+#endif
 
 #include <QtGlobal>
 #if QT_VERSION >= 0x050000

example/resize_image.cpp

@@ -127,6 +127,10 @@ void ImageWidget::initializeGL()
 
 void ImageWidget::resizeGL(int width, int height)
 {
+    // scale height/width based on device pixel ratio
+    width /= windowHandle()->devicePixelRatio();
+    height /= windowHandle()->devicePixelRatio();
+
     // resize viewport
     glViewport(0, 0, width, height);
 

include/boost/compute/interop/opengl/context.hpp

@@ -19,6 +19,11 @@
 #include <boost/compute/exception/unsupported_extension_error.hpp>
 #include <boost/compute/interop/opengl/cl_gl.hpp>
 
+#ifdef __APPLE__
+#include <OpenCL/cl_gl_ext.h>
+#include <OpenGL/OpenGL.h>
+#endif
+
 #ifdef __linux__
 #include <GL/glx.h>
 #endif
@@ -37,12 +42,31 @@ namespace compute {
 inline context opengl_create_shared_context()
 {
     // name of the OpenGL sharing extension for the system
-    #if defined(__APPLE__)
+#if defined(__APPLE__)
     const char *cl_gl_sharing_extension = "cl_APPLE_gl_sharing";
-    #else
+#else
     const char *cl_gl_sharing_extension = "cl_khr_gl_sharing";
-    #endif
+#endif
+
+#if defined(__APPLE__)
+    // get OpenGL share group
+    CGLContextObj cgl_current_context = CGLGetCurrentContext();
+    CGLShareGroupObj cgl_share_group = CGLGetShareGroup(cgl_current_context);
+
+    cl_context_properties properties[] = {
+        CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE,
+        (cl_context_properties) cgl_share_group,
+        0
+    };
+
+    cl_int error = 0;
+    cl_context cl_gl_context = clCreateContext(properties, 0, 0, 0, 0, &error);
+    if(!cl_gl_context){
+        BOOST_THROW_EXCEPTION(opencl_error(error));
+    }
 
+    return context(cl_gl_context, false);
+#else
     typedef cl_int(*GetGLContextInfoKHRFunction)(
         const cl_context_properties*, cl_gl_context_info, size_t, void *, size_t *
     );
@@ -62,21 +86,12 @@ inline context opengl_create_shared_context()
             continue;
         }
 
-        // get OpenGL share group (needed for Apple)
-        #ifdef __APPLE__
-        CGLContextObj cgl_current_context = CGLGetCurrentContext();
-        CGLShareGroupObj cgl_share_group = CGLGetShareGroup(cgl_current_context);
-        #endif
-
         // create context properties listing the platform and current OpenGL display
         cl_context_properties properties[] = {
             CL_CONTEXT_PLATFORM, (cl_context_properties) platform.id(),
         #if defined(__linux__)
             CL_GL_CONTEXT_KHR, (cl_context_properties) glXGetCurrentContext(),
             CL_GLX_DISPLAY_KHR, (cl_context_properties) glXGetCurrentDisplay(),
-        #elif defined(__APPLE__)
-            CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE,
-                (cl_context_properties) cgl_share_group,
         #elif defined(WIN32)
             CL_GL_CONTEXT_KHR, (cl_context_properties) wglGetCurrentContext(),
             CL_WGL_HDC_KHR, (cl_context_properties) wglGetCurrentDC(), 
@@ -106,6 +121,7 @@ inline context opengl_create_shared_context()
         // return CL-GL sharing context
         return context(gpu, properties);
     }
+#endif
 
     // no CL-GL sharing capable devices found
     BOOST_THROW_EXCEPTION(