TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-26 07:39:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bullet Library v2.81

Browse source
This commit is contained in:
LuisAntonRebollo 2013-07-04 20:50:16 +02:00
parent 64fef8b2ad
commit 1eb94f4828
462 changed files with 59613 additions and 8036 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/lib/bullet/src/BulletMultiThreaded/SpuFakeDma.cpp
View file

@ -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
}
@ -174,6 +174,9 @@ int cellDmaGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid,
{
char* mainMem = (char*)ea;
char* localStore = (char*)ls;
// printf("mainMem=%x, localStore=%x",mainMem,localStore);
#ifdef USE_MEMCPY
memcpy(localStore,mainMem,size);
#else
@ -182,6 +185,7 @@ int cellDmaGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid,
localStore[i] = mainMem[i];
}
#endif //#ifdef USE_MEMCPY
// printf(" finished\n");
return 0;
}