diff --git a/Extras/BulletMultiThreaded/SpuBatchRaycaster.cpp b/Extras/BulletMultiThreaded/SpuBatchRaycaster.cpp index 64d073685..075cbd76e 100644 --- a/Extras/BulletMultiThreaded/SpuBatchRaycaster.cpp +++ b/Extras/BulletMultiThreaded/SpuBatchRaycaster.cpp @@ -98,7 +98,7 @@ SpuBatchRaycaster::setCollisionObjectsSkipPE (btCollisionObjectArray& castUponOb index++; } - printf("Number of shapes bullet is casting against: %d\n", numNonPEShapes); +// printf("Number of shapes bullet is casting against: %d\n", numNonPEShapes); btAssert (index == numNonPEShapes); } diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp index 8d987165c..cf5aa54d4 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp @@ -298,11 +298,8 @@ void dmaBvhShapeData (bvhMeshShape_LocalStoreMemory* bvhMeshShape, btBvhTriangle dmaSize = sizeof(btTriangleIndexVertexArray); dmaPpuAddress2 = reinterpret_cast(triMeshShape->getMeshInterface()); // spu_printf("trimeshShape->getMeshInterface() == %llx\n",dmaPpuAddress2); -#ifdef DISABLE_CELL_DMA_GET_READ_ONLY // needed for PE ray caster - cellDmaGet(&bvhMeshShape->gTriangleMeshInterfaceStorage, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); -#else bvhMeshShape->gTriangleMeshInterfacePtr = (btTriangleIndexVertexArray*)cellDmaGetReadOnly(&bvhMeshShape->gTriangleMeshInterfaceStorage, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); -#endif + //cellDmaWaitTagStatusAll(DMA_MASK(1)); ///now DMA over the BVH diff --git a/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp index 1e59e77a9..d8fad073b 100644 --- a/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp +++ b/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp @@ -14,7 +14,6 @@ subject to the following restrictions: */ - #include "btOdeQuickstepConstraintSolver.h" #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"