From 71a31fbf4984de01dba3b77a027bb76b29b73cf0 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sat, 13 Jul 2013 00:21:56 -0700 Subject: [PATCH] kernel breaks on Mac OSX, so disable it on __APPLE__ --- .../BroadphaseCollision/b3GpuSapBroadphase.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp b/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp index 81f38745e..3dc115204 100644 --- a/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp +++ b/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp @@ -38,8 +38,11 @@ m_currentBuffer(-1) b3Assert(errNum==CL_SUCCESS); cl_program sapFastProg = b3OpenCLUtils::compileCLProgramFromString(m_context,m_device,sapFastSrc,&errNum,"",B3_BROADPHASE_SAPFAST_PATH); b3Assert(errNum==CL_SUCCESS); - +#ifndef __APPLE__ 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, "computePairsKernelBarrier",&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"); int numSmallAabbs = m_smallAabbsGPU.size(); @@ -659,4 +662,4 @@ int b3GpuSapBroadphase::getNumOverlap() cl_mem b3GpuSapBroadphase::getOverlappingPairBuffer() { return m_overlappingPairs.getBufferCL(); -} \ No newline at end of file +}