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

Fixes to allow compilation of BulletMultiThreaded under 64bit linux

Browse Source
This commit is contained in:
erwin.coumans
2008-11-14 23:51:49 +00:00
parent 86727242a2
commit cc43193b25
16 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
View File

@@ -164,7 +164,7 @@ void SpuContactResult::writeDoubleBufferedManifold(btPersistentManifold* lsManif
memcpy(g_manifoldDmaExport.getFront(),lsManifold,sizeof(btPersistentManifold));
g_manifoldDmaExport.swapBuffers();
uint64_t mmAddr = (uint32_t)mmManifold;
ppu_address_t mmAddr = (ppu_address_t)mmManifold;
g_manifoldDmaExport.backBufferDmaPut(mmAddr, sizeof(btPersistentManifold), DMA_TAG(9));
// Should there be any kind of wait here? What if somebody tries to use this tag again? What if we call this function again really soon?
//no, the swapBuffers does the wait

5
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
View File

@@ -842,7 +842,6 @@ void processCollisionTask(void* userPtr, void* lsMemPtr)
register ppu_address_t dmaPpuAddress;
register ppu_address_t dmaPpuAddress2;
int userInfo;
int numPairs;
register int p;
SpuCollisionPairInput collisionPairInput;
@@ -902,9 +901,7 @@ void processCollisionTask(void* userPtr, void* lsMemPtr)
spu_printf("pair->m_pProxy1 = %d\n",pair.m_pProxy1);
#endif //DEBUG_SPU_COLLISION_DETECTION
userInfo = int(pair.m_userInfo);
if (userInfo == 2 && pair.m_algorithm && pair.m_pProxy0 && pair.m_pProxy1)
if (pair.m_internalTmpValue == 2 && pair.m_algorithm && pair.m_pProxy0 && pair.m_pProxy1)
{
dmaSize = sizeof(SpuContactManifoldCollisionAlgorithm);
dmaPpuAddress2 = (ppu_address_t)pair.m_algorithm;