From d419f797702bc5c27af74450aaf6f2cac1e9d6bf Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 3 Apr 2011 19:30:26 +0000 Subject: [PATCH] fixes to make MultiThreadedDemo work in 64bit, ParallelConstraintSolver won't work yet, only the parallel collision dispatcher --- Demos/MultiThreadedDemo/MultiThreadedDemo.cpp | 2 +- src/BulletMultiThreaded/SpuFakeDma.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp index 5f5c437bc..cc1be22a1 100644 --- a/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp +++ b/Demos/MultiThreadedDemo/MultiThreadedDemo.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#define USE_PARALLEL_SOLVER 1 //experimental parallel solver +//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver #define USE_PARALLEL_DISPATCHER 1 #include "btBulletDynamicsCommon.h" diff --git a/src/BulletMultiThreaded/SpuFakeDma.cpp b/src/BulletMultiThreaded/SpuFakeDma.cpp index 61e1a49d6..b776a120a 100644 --- a/src/BulletMultiThreaded/SpuFakeDma.cpp +++ b/src/BulletMultiThreaded/SpuFakeDma.cpp @@ -30,7 +30,7 @@ void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag cellDmaLargeGet(ls,ea,size,tag,tid,rid); return ls; #else - return (void*)(uint32_t)ea; + return (void*)(ppu_address_t)ea; #endif } @@ -40,7 +40,7 @@ void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag mfc_get(ls,ea,size,tag,0,0); return ls; #else - return (void*)(uint32_t)ea; + return (void*)(ppu_address_t)ea; #endif } @@ -53,7 +53,7 @@ void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uin cellDmaGet(ls,ea,size,tag,tid,rid); return ls; #else - return (void*)(uint32_t)ea; + return (void*)(ppu_address_t)ea; #endif }