Apple contribution for OSX SSE and iOS NEON optimizations unit tests, thanks to Jordan Hubbard, Ian Ollmann and Hristo Hristov.
For OSX: cd build ./premake_osx xcode4 for iOS: cd build ./ios_build.sh ./ios_run.sh Also integrated the branches/StackAllocation to make it easier to multi-thread collision detection in the near future. It avoids changing the btCollisionObject while performing collision detection. As this is a large patch, some stuff might be temporarily broken, I'll keep an eye out on issues.
This commit is contained in:
@@ -4,7 +4,7 @@ rem premake4 --no-pedemos vs2008
|
||||
rem premake4 --no-bulletlibs --no-pelibs vs2008
|
||||
rem premake4 --with-nacl vs2008
|
||||
|
||||
..\..\..\msvc\premake4 vs2008
|
||||
..\..\..\build\premake4 vs2008
|
||||
mkdir vs2008\cache
|
||||
|
||||
pause
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
..\..\..\msvc\premake4 vs2010
|
||||
..\..\..\build\premake4 vs2010
|
||||
|
||||
mkdir vs2010\cache
|
||||
pause
|
||||
@@ -267,9 +267,7 @@ void bt3dGridBroadphaseOCL::allocateBuffers()
|
||||
m_dPairsChanged = clCreateBuffer(m_cxMainContext, CL_MEM_READ_WRITE, memSize, NULL, &ciErrNum);
|
||||
GRID3DOCL_CHECKERROR(ciErrNum, CL_SUCCESS);
|
||||
|
||||
m_dPairsContiguous = clCreateBuffer(m_cxMainContext, CL_MEM_READ_WRITE, memSize, NULL, &ciErrNum);
|
||||
GRID3DOCL_CHECKERROR(ciErrNum, CL_SUCCESS);
|
||||
|
||||
|
||||
memSize = 3 * 4 * sizeof(float);
|
||||
m_dBpParams = clCreateBuffer(m_cxMainContext, CL_MEM_READ_WRITE, memSize, NULL, &ciErrNum);
|
||||
GRID3DOCL_CHECKERROR(ciErrNum, CL_SUCCESS);
|
||||
|
||||
@@ -92,7 +92,6 @@ public:
|
||||
protected:
|
||||
cl_mem m_dPairScanChanged;
|
||||
cl_mem m_dPairsChanged;
|
||||
cl_mem m_dPairsContiguous;
|
||||
cl_mem m_dBpParams;
|
||||
|
||||
adl::Device* m_deviceHost;
|
||||
|
||||
@@ -63,8 +63,7 @@ btGridBroadphaseCl::btGridBroadphaseCl( btOverlappingPairCache* overlappingPairC
|
||||
maxSmallProxySize,maxSmallProxiesPerCell,
|
||||
context,device,queue,deviceCL)
|
||||
{
|
||||
m_computeAabbKernel = m_deviceCL->getKernel(COMPUTE_AABB_KERNEL_PATH,"computeAabb","",spComputeAabbSource);
|
||||
|
||||
|
||||
m_countOverlappingPairs = m_deviceCL->getKernel(COMPUTE_AABB_KERNEL_PATH,"countOverlappingpairs","",spComputeAabbSource);
|
||||
|
||||
m_squeezePairCaches = m_deviceCL->getKernel(COMPUTE_AABB_KERNEL_PATH,"squeezePairCaches","",spComputeAabbSource);
|
||||
|
||||
@@ -35,7 +35,6 @@ class btGridBroadphaseCl : public bt3dGridBroadphaseOCL
|
||||
{
|
||||
protected:
|
||||
|
||||
adl::Kernel* m_computeAabbKernel;
|
||||
adl::Kernel* m_countOverlappingPairs;
|
||||
adl::Kernel* m_squeezePairCaches;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user