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

fixes to compile/share more code between SPU and PPU

Browse Source
This commit is contained in:
ejcoumans
2008-02-01 03:35:54 +00:00
parent 1cdd5bf67f
commit 5399a9ae8c
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/BulletMultiThreaded/SpuDoubleBuffer.h
View File

@@ -9,7 +9,7 @@
template<class T, int size> template<class T, int size>
class DoubleBuffer class DoubleBuffer
{ {
#if defined(__CELLOS_LV2__) || defined(USE_LIBSPE2) #if defined(__SPU__) || defined(USE_LIBSPE2)
ATTRIBUTE_ALIGNED128( T m_buffer0[size] ) ; ATTRIBUTE_ALIGNED128( T m_buffer0[size] ) ;
ATTRIBUTE_ALIGNED128( T m_buffer1[size] ) ; ATTRIBUTE_ALIGNED128( T m_buffer1[size] ) ;
#else #else

8
Extras/BulletMultiThreaded/SpuFakeDma.cpp
View File

@@ -22,7 +22,7 @@ void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag
void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid)
{ {
#if defined (__CELLOS_LV2__) || defined (USE_LIBSPE2) #if defined (__SPU__) || defined (USE_LIBSPE2)
mfc_get(ls,ea,size,tag,0,0); mfc_get(ls,ea,size,tag,0,0);
return ls; return ls;
#else #else
@@ -35,7 +35,7 @@ void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag
void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid)
{ {
#if defined (__CELLOS_LV2__) || defined (USE_LIBSPE2) #if defined (__SPU__) || defined (USE_LIBSPE2)
cellDmaGet(ls,ea,size,tag,tid,rid); cellDmaGet(ls,ea,size,tag,tid,rid);
return ls; return ls;
#else #else
@@ -60,7 +60,7 @@ int stallingUnalignedDmaSmallGet(void *ls, uint64_t ea, uint32_t size)
///make sure last 4 bits are the same, for cellDmaSmallGet ///make sure last 4 bits are the same, for cellDmaSmallGet
uint32_t last4BitsOffset = ea & 0x0f; uint32_t last4BitsOffset = ea & 0x0f;
char* tmpTarget = tmpBuffer + last4BitsOffset; char* tmpTarget = tmpBuffer + last4BitsOffset;
#if defined (__CELLOS_LV2__) || defined (USE_LIBSPE2) #if defined (__SPU__) || defined (USE_LIBSPE2)
mfc_get(tmpTarget,ea,size,DMA_TAG(1),0,0); mfc_get(tmpTarget,ea,size,DMA_TAG(1),0,0);
#else #else
//copy into final destination //copy into final destination
@@ -86,7 +86,7 @@ int stallingUnalignedDmaSmallGet(void *ls, uint64_t ea, uint32_t size)
return 0; return 0;
} }
#if defined (__CELLOS_LV2__) || defined (USE_LIBSPE2) #if defined (__SPU__) || defined (USE_LIBSPE2)
#else #else
int cellDmaLargeGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) int cellDmaLargeGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid)

2
Extras/BulletMultiThreaded/SpuFakeDma.h
View File

@@ -7,7 +7,7 @@
#include "LinearMath/btScalar.h" #include "LinearMath/btScalar.h"
#ifdef __CELLOS_LV2__ #ifdef __SPU__
#include <cell/dma.h> #include <cell/dma.h>
#include <stdint.h> #include <stdint.h>

1
Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
View File

@@ -13,6 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SpuCollisionShapes.h" #include "SpuCollisionShapes.h"
btPoint3 localGetSupportingVertexWithoutMargin(int shapeType, void* shape, btVector3& localDir,struct SpuConvexPolyhedronVertexData* convexVertexData)//, int *featureIndex) btPoint3 localGetSupportingVertexWithoutMargin(int shapeType, void* shape, btVector3& localDir,struct SpuConvexPolyhedronVertexData* convexVertexData)//, int *featureIndex)

1
Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
View File

@@ -15,7 +15,6 @@ subject to the following restrictions:
#include "SpuContactResult.h" #include "SpuContactResult.h"
//#define DEBUG_SPU_COLLISION_DETECTION 1 //#define DEBUG_SPU_COLLISION_DETECTION 1

2
Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
View File

@@ -28,7 +28,7 @@
#include "SpuCollisionShapes.h" //definition of SpuConvexPolyhedronVertexData #include "SpuCollisionShapes.h" //definition of SpuConvexPolyhedronVertexData
#ifdef __CELLOS_LV2__ #ifdef __SPU__
///Software caching from the IBM Cell SDK, it reduces 25% SPU time for our test cases ///Software caching from the IBM Cell SDK, it reduces 25% SPU time for our test cases
#define USE_SOFTWARE_CACHE 1 #define USE_SOFTWARE_CACHE 1
#endif //__CELLOS_LV2__ #endif //__CELLOS_LV2__

2
src/BulletCollision/BroadphaseCollision/btDispatcher.h
View File

@@ -43,7 +43,7 @@ struct btDispatcherInfo
m_useContinuous(false), m_useContinuous(false),
m_debugDraw(0), m_debugDraw(0),
m_enableSatConvex(false), m_enableSatConvex(false),
m_enableSPU(false), m_enableSPU(true),
m_stackAllocator(0) m_stackAllocator(0)
{ {