Merge pull request #146 from MSOpenTech/v3-winrt-bullet

V3: Windows 8.1 Universal App version of Bullet 3D physics lib

Author: minggo

bullet/BulletMultiThreaded/SequentialThreadSupport.cpp

@@ -116,7 +116,11 @@ class btDummyBarrier : public btBarrier
 	virtual int  getMaxCount() {return 1;}
 };
 
+#ifdef WINRT
+__declspec(align(16)) class btDummyCriticalSection : public btCriticalSection
+#else
 class btDummyCriticalSection : public btCriticalSection
+#endif
 {
 
 public:
@@ -128,6 +132,18 @@ class btDummyCriticalSection : public btCriticalSection
 	{
 	}
 
+#ifdef WINRT
+    void* operator new(size_t i)
+    {
+        return _aligned_malloc(i, 16);
+    }
+
+    void operator delete(void* p)
+    {
+        _aligned_free(p);
+    }
+#endif
+
 	unsigned int getSharedParam(int i)
 	{
 		btAssert(i>=0&&i<31);

bullet/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp

@@ -29,11 +29,26 @@ subject to the following restrictions:
 
 #define MAX_NUM_BODIES 8192
 
+#ifdef WINRT
+__declspec(align(16)) struct SampleTask_LocalStoreMemory
+#else
 struct SampleTask_LocalStoreMemory
+#endif
 {
 	ATTRIBUTE_ALIGNED16(char gLocalRigidBody [sizeof(btRigidBody)+16]);
 	ATTRIBUTE_ALIGNED16(void* gPointerArray[MAX_NUM_BODIES]);
 
+#ifdef WINRT
+    void* operator new(size_t i)
+    {
+        return _aligned_malloc(i, 16);
+    }
+
+    void operator delete(void* p)
+    {
+        _aligned_free(p);
+    }
+#endif
 };
 
 

bullet/BulletMultiThreaded/Win32ThreadSupport.cpp

@@ -23,7 +23,12 @@ subject to the following restrictions:
 
 #include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
 
-
+#ifdef WINRT
+#include <atlstr.h>
+#define InitializeCriticalSection(arg0) InitializeCriticalSectionEx(arg0, 0, 0)
+#define WaitForSingleObject(arg0, arg1) WaitForSingleObjectEx(arg0, arg1, false);
+#define WaitForMultipleObjects(arg0, arg1, arg2, arg3) WaitForMultipleObjectsEx(arg0, arg1, arg2, arg3, false);
+#endif
 
 ///The number of threads should be equal to the number of available cores
 ///@todo: each worker should be linked to a single core, using SetThreadIdealProcessor.
@@ -223,7 +228,6 @@ bool Win32ThreadSupport::isTaskCompleted(unsigned int *puiArgument0, unsigned in
 	return false;
 }
 
-
 void Win32ThreadSupport::startThreads(const Win32ThreadConstructionInfo& threadConstructionInfo)
 {
 
@@ -248,19 +252,28 @@ void Win32ThreadSupport::startThreads(const Win32ThreadConstructionInfo& threadC
 		spuStatus.m_userPtr=0;
 
 		sprintf(spuStatus.m_eventStartHandleName,"eventStart%s%d",threadConstructionInfo.m_uniqueName,i);
+#ifdef WINRT
+        spuStatus.m_eventStartHandle = CreateEventEx(NULL, CString(spuStatus.m_eventStartHandleName), 0, EVENT_ALL_ACCESS);
+#else
 		spuStatus.m_eventStartHandle = CreateEventA (0,false,false,spuStatus.m_eventStartHandleName);
+#endif
 
 		sprintf(spuStatus.m_eventCompletetHandleName,"eventComplete%s%d",threadConstructionInfo.m_uniqueName,i);
-		spuStatus.m_eventCompletetHandle = CreateEventA (0,false,false,spuStatus.m_eventCompletetHandleName);
+#ifdef WINRT
+        spuStatus.m_eventCompletetHandle = CreateEventEx(NULL, CString(spuStatus.m_eventStartHandleName), 0, EVENT_ALL_ACCESS);
+#else
+        spuStatus.m_eventCompletetHandle = CreateEventA (0,false,false,spuStatus.m_eventCompletetHandleName);
+#endif
 
 		m_completeHandles[i] = spuStatus.m_eventCompletetHandle;
 
 		HANDLE handle = CreateThread(lpThreadAttributes,dwStackSize,lpStartAddress,lpParameter,	dwCreationFlags,lpThreadId);
 		SetThreadPriority(handle,THREAD_PRIORITY_HIGHEST);
 		//SetThreadPriority(handle,THREAD_PRIORITY_TIME_CRITICAL);
 
-		SetThreadAffinityMask(handle, 1<<i);
-
+#ifndef WINRT
+        SetThreadAffinityMask(handle, 1<<i);
+#endif
 		spuStatus.m_taskId = i;
 		spuStatus.m_commandId = 0;
 		spuStatus.m_status = 0;
@@ -326,8 +339,13 @@ class btWin32Barrier : public btBarrier
 		mEnableCounter = 0;
 		InitializeCriticalSection(&mExternalCriticalSection);
 		InitializeCriticalSection(&mLocalCriticalSection);
-		mRunEvent = CreateEvent(NULL,TRUE,FALSE,NULL);
-		mNotifyEvent = CreateEvent(NULL,TRUE,FALSE,NULL);
+#ifdef WINRT
+        mRunEvent = CreateEventEx(NULL, NULL, CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS);
+        mNotifyEvent = CreateEventEx(NULL, NULL, CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS);
+#else
+        mRunEvent = CreateEvent(NULL,TRUE,FALSE,NULL);
+        mNotifyEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+#endif
 	}
 
 	virtual ~btWin32Barrier()

bullet/BulletMultiThreaded/btParallelConstraintSolver.h

@@ -251,6 +251,28 @@ ATTRIBUTE_ALIGNED16(struct) btConstraintSolverIO {
 	uint32_t barrierAddr2;
 	uint32_t criticalsectionAddr2;
 	uint32_t maxTasks1;
+
+#ifdef WINRT
+    void* operator new(size_t i)
+    {
+        return _aligned_malloc(i, 16);
+    }
+
+    void operator delete(void* p)
+    {
+        _aligned_free(p);
+    }
+
+    void* operator new[](size_t i)
+    {
+        return _aligned_malloc(i, 16);
+    }
+
+    void operator delete[](void* p)
+    {
+        _aligned_free(p);
+    }
+#endif
 };
 
 

bullet/LinearMath/btQuickprof.cpp

@@ -39,6 +39,10 @@ static btClock gProfileClock;
 #define NOMCX
 #define NOIME 
 
+#ifdef WINRT
+#define GetTickCount GetTickCount64
+#endif
+
 #ifdef _XBOX
 	#include <Xtl.h>
 #else //_XBOX
@@ -59,7 +63,11 @@ struct btClockData
 
 #ifdef BT_USE_WINDOWS_TIMERS
 	LARGE_INTEGER mClockFrequency;
+#ifdef WINRT
+    LONGLONG mStartTick;
+#else
 	DWORD mStartTick;
+#endif
 	LONGLONG mPrevElapsedTime;
 	LARGE_INTEGER mStartTime;
 #else
@@ -136,7 +144,7 @@ unsigned long int btClock::getTimeMilliseconds()
 		// Check for unexpected leaps in the Win32 performance counter.  
 	// (This is caused by unexpected data across the PCI to ISA 
 		// bridge, aka south bridge.  See Microsoft KB274323.)
-		unsigned long elapsedTicks = GetTickCount() - m_data->mStartTick;
+		unsigned long elapsedTicks = static_cast<unsigned long>(GetTickCount() - m_data->mStartTick);
 		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
 		if (msecOff < -100 || msecOff > 100)
 		{
@@ -194,7 +202,7 @@ unsigned long int btClock::getTimeMicroseconds()
 		// Check for unexpected leaps in the Win32 performance counter.  
 		// (This is caused by unexpected data across the PCI to ISA 
 		// bridge, aka south bridge.  See Microsoft KB274323.)
-		unsigned long elapsedTicks = GetTickCount() - m_data->mStartTick;
+        unsigned long elapsedTicks = static_cast<unsigned long>(GetTickCount() - m_data->mStartTick);
 		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
 		if (msecOff < -100 || msecOff > 100)
 		{

bullet/LinearMath/btScalar.h

@@ -48,6 +48,11 @@ inline int	btGetVersion()
 			#define ATTRIBUTE_ALIGNED16(a) a
 			#define ATTRIBUTE_ALIGNED64(a) a
 			#define ATTRIBUTE_ALIGNED128(a) a
+        #elif (_M_ARM)
+            #define SIMD_FORCE_INLINE __forceinline
+            #define ATTRIBUTE_ALIGNED16(a) __declspec() a
+            #define ATTRIBUTE_ALIGNED64(a) __declspec() a
+            #define ATTRIBUTE_ALIGNED128(a) __declspec () a
 		#else
 			//#define BT_HAS_ALIGNED_ALLOCATOR
 			#pragma warning(disable : 4324) // disable padding warning