TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix lib ConvexDecomp to compile on WIN64.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-07-06 12:24:48 +02:00
parent 1bbc3d9e8a
commit a93f179138
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/lib/convexDecomp/NvThreadConfig.cpp
View file

@ -133,6 +133,8 @@ void tc_spinloop()
asm ( "pause" ); asm ( "pause" );
#elif defined( _XBOX ) #elif defined( _XBOX )
// Pause would do nothing on the Xbox. Threads are not scheduled. // Pause would do nothing on the Xbox. Threads are not scheduled.
#elif defined( _WIN64 )
YieldProcessor( );
#else #else
__asm { pause }; __asm { pause };
#endif #endif
@ -144,7 +146,7 @@ void tc_interlockedExchange(void *dest, const int64_t exchange)
// not working // not working
assert(false); assert(false);
//__sync_lock_test_and_set((int64_t*)dest, exchange); //__sync_lock_test_and_set((int64_t*)dest, exchange);
#elif defined( _XBOX ) #elif defined( _XBOX ) || defined( _WIN64 )
InterlockedExchange((volatile LONG *)dest, exchange); InterlockedExchange((volatile LONG *)dest, exchange);
#else #else
__asm __asm
@ -172,7 +174,7 @@ NxI32 tc_interlockedCompareExchange(void *dest, NxI32 exchange, NxI32 compare)
return 0; return 0;
//return __sync_val_compare_and_swap((uintptr_t*)dest, exchange, compare); //return __sync_val_compare_and_swap((uintptr_t*)dest, exchange, compare);
//return __sync_bool_compare_and_swap((uintptr_t*)dest, exchange, compare); //return __sync_bool_compare_and_swap((uintptr_t*)dest, exchange, compare);
#elif defined( _XBOX ) #elif defined( _XBOX ) || defined( _WIN64 )
return InterlockedCompareExchange((volatile LONG *)dest, exchange, compare); return InterlockedCompareExchange((volatile LONG *)dest, exchange, compare);
#else #else
char _ret; char _ret;
@ -202,7 +204,7 @@ NxI32 tc_interlockedCompareExchange(void *dest, const NxI32 exchange1, const NxI
//uint64_t exchange = ((uint64_t)exchange1 << 32) | (uint64_t)exchange2; //uint64_t exchange = ((uint64_t)exchange1 << 32) | (uint64_t)exchange2;
//uint64_t compare = ((uint64_t)compare1 << 32) | (uint64_t)compare2; //uint64_t compare = ((uint64_t)compare1 << 32) | (uint64_t)compare2;
//return __sync_bool_compare_and_swap((int64_t*)dest, exchange, compare); //return __sync_bool_compare_and_swap((int64_t*)dest, exchange, compare);
#elif defined( _XBOX ) #elif defined( _XBOX ) || defined( _WIN64 )
assert(false); assert(false);
return 0; return 0;
#else #else