AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-15 06:00:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
erwin coumans 2013-07-14 19:16:55 -07:00
commit cc188ca815
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp
View File

@ -38,8 +38,11 @@ m_currentBuffer(-1)
b3Assert(errNum==CL_SUCCESS); b3Assert(errNum==CL_SUCCESS);
cl_program sapFastProg = b3OpenCLUtils::compileCLProgramFromString(m_context,m_device,sapFastSrc,&errNum,"",B3_BROADPHASE_SAPFAST_PATH); cl_program sapFastProg = b3OpenCLUtils::compileCLProgramFromString(m_context,m_device,sapFastSrc,&errNum,"",B3_BROADPHASE_SAPFAST_PATH);
b3Assert(errNum==CL_SUCCESS); b3Assert(errNum==CL_SUCCESS);
#ifndef __APPLE__
m_prefixScanFloat4 = new b3PrefixScanFloat4CL(m_context,m_device,m_queue); m_prefixScanFloat4 = new b3PrefixScanFloat4CL(m_context,m_device,m_queue);
#else
m_prefixScanFloat4 = 0;
#endif
//m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelOriginal",&errNum,sapProg ); //m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelOriginal",&errNum,sapProg );
//m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelBarrier",&errNum,sapProg ); //m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelBarrier",&errNum,sapProg );
//m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelLocalSharedMemory",&errNum,sapProg ); //m_sapKernel = b3OpenCLUtils::compileCLKernelFromString(m_context, m_device,sapSrc, "computePairsKernelLocalSharedMemory",&errNum,sapProg );
@ -358,7 +361,7 @@ void b3GpuSapBroadphase::calculateOverlappingPairs(int maxPairs)
} }
if (m_prefixScanFloat4)
{ {
B3_PROFILE("compute best variance axis"); B3_PROFILE("compute best variance axis");
int numSmallAabbs = m_smallAabbsGPU.size(); int numSmallAabbs = m_smallAabbsGPU.size();
@ -659,4 +662,4 @@ int b3GpuSapBroadphase::getNumOverlap()
cl_mem b3GpuSapBroadphase::getOverlappingPairBuffer() cl_mem b3GpuSapBroadphase::getOverlappingPairBuffer()
{ {
return m_overlappingPairs.getBufferCL(); return m_overlappingPairs.getBufferCL();
} }