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

remove btOclGetMaxFlopsDev, it was buggy. Just use device 0 in the demos. The OpenCL initialization needs more work/some GUI.

Browse Source
This commit is contained in:
erwin.coumans
2011-11-11 20:11:03 +00:00
parent 66c349caa6
commit a374f8c0d4
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/OpenCLClothDemo/clstuff.cpp
View File

@@ -71,7 +71,8 @@ void initCL( void* glCtx, void* glDC )
oclCHECKERROR(ciErrNum, CL_SUCCESS); oclCHECKERROR(ciErrNum, CL_SUCCESS);
g_cdDevice = btOclGetMaxFlopsDev(g_cxMainContext); g_cdDevice = btOclGetDev(g_cxMainContext,0);
btOclPrintDevInfo(g_cdDevice); btOclPrintDevInfo(g_cdDevice);

2
Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
View File

@@ -346,7 +346,7 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
#endif #endif
oclCHECKERROR(ciErrNum, CL_SUCCESS); oclCHECKERROR(ciErrNum, CL_SUCCESS);
m_cdDevice = btOclGetMaxFlopsDev(m_cxMainContext); m_cdDevice = btOclGetDev(m_cxMainContext,0);
btOclPrintDevInfo(m_cdDevice); btOclPrintDevInfo(m_cdDevice);

2
Demos/SerializeDemo/main.cpp
View File

@@ -72,7 +72,7 @@ bool initCL( void* glCtx, void* glDC )
//#endif //#endif
oclCHECKERROR(ciErrNum, CL_SUCCESS); oclCHECKERROR(ciErrNum, CL_SUCCESS);
g_cdDevice = btOclGetMaxFlopsDev(g_cxMainContext); g_cdDevice = btOclGetDev(g_cxMainContext,0);
if ( bDebug ) { if ( bDebug ) {
btOclPrintDevInfo(g_cdDevice); btOclPrintDevInfo(g_cdDevice);

1
src/LinearMath/CMakeLists.txt
View File

@@ -20,6 +20,7 @@ SET(LinearMath_HDRS
btConvexHullComputer.h btConvexHullComputer.h
btDefaultMotionState.h btDefaultMotionState.h
btGeometryUtil.h btGeometryUtil.h
btGrahamScan2dConvexHull.h
btHashMap.h btHashMap.h
btIDebugDraw.h btIDebugDraw.h
btList.h btList.h