update boost on linux
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
#ifndef BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_HPP
|
||||
#define BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_HPP
|
||||
|
||||
#include <boost/compute/detail/cl_versions.hpp>
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <OpenCL/cl_gl.h>
|
||||
#else
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
#ifndef BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_EXT_HPP
|
||||
#define BOOST_COMPUTE_INTEROP_OPENGL_CL_GL_EXT_HPP
|
||||
|
||||
#include <boost/compute/detail/cl_versions.hpp>
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <OpenCL/cl_gl_ext.h>
|
||||
#else
|
||||
|
||||
@@ -75,6 +75,10 @@ inline context opengl_create_shared_context()
|
||||
for(size_t i = 0; i < platforms.size(); i++){
|
||||
const platform &platform = platforms[i];
|
||||
|
||||
// check whether this platform supports OpenCL/OpenGL sharing
|
||||
if (!platform.supports_extension(cl_gl_sharing_extension))
|
||||
continue;
|
||||
|
||||
// load clGetGLContextInfoKHR() extension function
|
||||
GetGLContextInfoKHRFunction GetGLContextInfoKHR =
|
||||
reinterpret_cast<GetGLContextInfoKHRFunction>(
|
||||
@@ -92,9 +96,9 @@ inline context opengl_create_shared_context()
|
||||
#if defined(__linux__)
|
||||
CL_GL_CONTEXT_KHR, (cl_context_properties) glXGetCurrentContext(),
|
||||
CL_GLX_DISPLAY_KHR, (cl_context_properties) glXGetCurrentDisplay(),
|
||||
#elif defined(WIN32)
|
||||
#elif defined(_WIN32)
|
||||
CL_GL_CONTEXT_KHR, (cl_context_properties) wglGetCurrentContext(),
|
||||
CL_WGL_HDC_KHR, (cl_context_properties) wglGetCurrentDC(),
|
||||
CL_WGL_HDC_KHR, (cl_context_properties) wglGetCurrentDC(),
|
||||
#endif
|
||||
0
|
||||
};
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
{
|
||||
cl_int error = 0;
|
||||
|
||||
#ifdef CL_VERSION_1_2
|
||||
#ifdef BOOST_COMPUTE_CL_VERSION_1_2
|
||||
m_mem = clCreateFromGLTexture(context,
|
||||
flags,
|
||||
texture_target,
|
||||
|
||||
Reference in New Issue
Block a user