Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix clew/Windows build (disable CL/GL sharing)

Browse Source
This commit is contained in:
erwin coumans
2013-05-21 16:58:03 -07:00
parent d25e21614a
commit 9365735a8f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
View File

@@ -59,7 +59,9 @@ static const char* spPlatformVendor =
#ifndef CL_PLATFORM_MINI_CL #ifndef CL_PLATFORM_MINI_CL
#ifdef _WIN32 #ifdef _WIN32
#ifndef B3_USE_CLEW
#include "CL/cl_gl.h" #include "CL/cl_gl.h"
#endif //B3_USE_CLEW
#endif //_WIN32 #endif //_WIN32
#endif #endif
@@ -214,7 +216,8 @@ cl_context b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_d
cl_context_properties cps[7] = {0,0,0,0,0,0,0}; cl_context_properties cps[7] = {0,0,0,0,0,0,0};
cps[0] = CL_CONTEXT_PLATFORM; cps[0] = CL_CONTEXT_PLATFORM;
cps[1] = (cl_context_properties)platform; cps[1] = (cl_context_properties)platform;
#ifdef _WIN32 #ifdef _WIN32 &&
#ifndef B3_USE_CLEW
if (pGLContext && pGLDC) if (pGLContext && pGLDC)
{ {
cps[2] = CL_GL_CONTEXT_KHR; cps[2] = CL_GL_CONTEXT_KHR;
@@ -222,6 +225,7 @@ cl_context b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_d
cps[4] = CL_WGL_HDC_KHR; cps[4] = CL_WGL_HDC_KHR;
cps[5] = (cl_context_properties)pGLDC; cps[5] = (cl_context_properties)pGLDC;
} }
#endif //B3_USE_CLEW
#endif //_WIN32 #endif //_WIN32
num_entries = B3_MAX_CL_DEVICES; num_entries = B3_MAX_CL_DEVICES;