PhysX 3.4, APEX 1.4 patch release @22017166

33 files changed, 12 insertions, 70 deletions

diff --git a/PxShared/include/foundation/PxPreprocessor.h b/PxShared/include/foundation/PxPreprocessor.h
index 446ca762..7921217d 100644
--- a/PxShared/include/foundation/PxPreprocessor.h
+++ b/PxShared/include/foundation/PxPreprocessor.h
@@ -532,5 +532,11 @@ protected:
 
 #define PX_SUPPORT_COMPUTE_PHYSX 0
 
+#ifndef PX_SUPPORT_EXTERN_TEMPLATE
+#define PX_SUPPORT_EXTERN_TEMPLATE ((!PX_ANDROID) && (PX_VC != 11))
+#else
+#define PX_SUPPORT_EXTERN_TEMPLATE 0
+#endif
+
 /** @} */
 #endif // #ifndef PXFOUNDATION_PXPREPROCESSOR_H
diff --git a/PxShared/include/task/PxTask.h b/PxShared/include/task/PxTask.h
index 27611095..85d91da9 100644
--- a/PxShared/include/task/PxTask.h
+++ b/PxShared/include/task/PxTask.h
@@ -45,7 +45,7 @@ namespace physx
 class PxBaseTask
 {
 public:
-	PxBaseTask() : mEventID(0xFFFF), mProfileStat(0), mTm(0) {}
+	PxBaseTask() : mContextID(0), mTm(NULL) {}
 	virtual ~PxBaseTask() {}
 
     /**
@@ -78,50 +78,24 @@ public:
 	 * references to it - so it may safely run its destructor, recycle itself, etc.
 	 * provided no additional user references to the task exist
 	 */
-
     virtual void		release() = 0;
 
-	/**
-     * \brief Execute user run method with wrapping profiling events.
-     *
-     * Optional entry point for use by CpuDispatchers.
-	 *
-	 * \param[in] threadId The threadId of the thread that executed the task.
-	 */
-	PX_INLINE void runProfiled(uint32_t threadId=0)
-	{		
-		mTm->emitStartEvent(*this, threadId);
-		run();
-		mTm->emitStopEvent(*this, threadId);
-	}
-
-	/**
-     * \brief Specify stop event statistic
-     *
-     * If called before or while the task is executing, the given value
-	 * will appear in the task's event bar in the profile viewer
-	 *
-	 * \param[in] stat The stat to signal when the task is finished
-	 */
-	PX_INLINE void setProfileStat( uint16_t stat )
-	{
-		mProfileStat = stat;
-	}
-
     /**
      * \brief Return PxTaskManager to which this task was submitted
      *
      * Note, can return NULL if task was not submitted, or has been
      * completed.
      */
-	PX_INLINE PxTaskManager* getTaskManager() const
+	PX_FORCE_INLINE PxTaskManager* getTaskManager() const
 	{
 		return mTm;
 	}
 
+	PX_FORCE_INLINE	void	setContextId(PxU64 id)			{ mContextID = id;		}
+	PX_FORCE_INLINE	PxU64	getContextId()			const	{ return mContextID;	}
+
 protected:
-	uint16_t			mEventID;		//!< Registered profile event ID
-	uint16_t			mProfileStat;	//!< Profiling statistic
+	PxU64				mContextID;		//!< Context ID for profiler interface
 	PxTaskManager*		mTm;			//!< Owning PxTaskManager instance
 
 	friend class PxTaskMgr;
@@ -212,7 +186,6 @@ public:
 	{
 		mStreamIndex = 0;
 		mPreSyncRequired = false;
-		mProfileStat = 0;
 	}
 
 	/**
diff --git a/PxShared/include/task/PxTaskManager.h b/PxShared/include/task/PxTaskManager.h
index f6f29c42..f40f7b16 100644
--- a/PxShared/include/task/PxTaskManager.h
+++ b/PxShared/include/task/PxTaskManager.h
@@ -215,9 +215,6 @@ protected:
 	virtual void decrReference(PxLightCpuTask&) = 0;
 	virtual void addReference(PxLightCpuTask&) = 0;
 
-	virtual void emitStartEvent(PxBaseTask&, uint32_t threadId=0) = 0;
-	virtual void emitStopEvent(PxBaseTask&, uint32_t threadId=0) = 0;
-
 	/*! \endcond */
 
 	friend class PxBaseTask;
diff --git a/PxShared/lib/linux64/libPxCudaContextManager.a b/PxShared/lib/linux64/libPxCudaContextManager.a
index a197a8e3..7545faba 100644
--- a/PxShared/lib/linux64/libPxCudaContextManager.a
+++ b/PxShared/lib/linux64/libPxCudaContextManager.a
diff --git a/PxShared/lib/linux64/libPxCudaContextManagerCHECKED.a b/PxShared/lib/linux64/libPxCudaContextManagerCHECKED.a
index 58552d42..2cb81c96 100644
--- a/PxShared/lib/linux64/libPxCudaContextManagerCHECKED.a
+++ b/PxShared/lib/linux64/libPxCudaContextManagerCHECKED.a
diff --git a/PxShared/lib/linux64/libPxCudaContextManagerDEBUG.a b/PxShared/lib/linux64/libPxCudaContextManagerDEBUG.a
index 49568acc..2a3ec94f 100644
--- a/PxShared/lib/linux64/libPxCudaContextManagerDEBUG.a
+++ b/PxShared/lib/linux64/libPxCudaContextManagerDEBUG.a
diff --git a/PxShared/lib/linux64/libPxCudaContextManagerPROFILE.a b/PxShared/lib/linux64/libPxCudaContextManagerPROFILE.a
index a4c3f156..6cef1627 100644
--- a/PxShared/lib/linux64/libPxCudaContextManagerPROFILE.a
+++ b/PxShared/lib/linux64/libPxCudaContextManagerPROFILE.a
diff --git a/PxShared/lib/vc11win32/PxCudaContextManagerCHECKED_x86.lib b/PxShared/lib/vc11win32/PxCudaContextManagerCHECKED_x86.lib
index 8968fbd9..fc4742f8 100644
--- a/PxShared/lib/vc11win32/PxCudaContextManagerCHECKED_x86.lib
+++ b/PxShared/lib/vc11win32/PxCudaContextManagerCHECKED_x86.lib
diff --git a/PxShared/lib/vc11win32/PxCudaContextManagerDEBUG_x86.lib b/PxShared/lib/vc11win32/PxCudaContextManagerDEBUG_x86.lib
index a097e28b..87bf004f 100644
--- a/PxShared/lib/vc11win32/PxCudaContextManagerDEBUG_x86.lib
+++ b/PxShared/lib/vc11win32/PxCudaContextManagerDEBUG_x86.lib
diff --git a/PxShared/lib/vc11win32/PxCudaContextManagerPROFILE_x86.lib b/PxShared/lib/vc11win32/PxCudaContextManagerPROFILE_x86.lib
index 30b0918b..594f61cd 100644
--- a/PxShared/lib/vc11win32/PxCudaContextManagerPROFILE_x86.lib
+++ b/PxShared/lib/vc11win32/PxCudaContextManagerPROFILE_x86.lib
diff --git a/PxShared/lib/vc11win32/PxCudaContextManager_x86.lib b/PxShared/lib/vc11win32/PxCudaContextManager_x86.lib
index 9d3e05fd..765db72d 100644
--- a/PxShared/lib/vc11win32/PxCudaContextManager_x86.lib
+++ b/PxShared/lib/vc11win32/PxCudaContextManager_x86.lib
diff --git a/PxShared/lib/vc11win64/PxCudaContextManagerCHECKED_x64.lib b/PxShared/lib/vc11win64/PxCudaContextManagerCHECKED_x64.lib
index 7567b2c6..5865df94 100644
--- a/PxShared/lib/vc11win64/PxCudaContextManagerCHECKED_x64.lib
+++ b/PxShared/lib/vc11win64/PxCudaContextManagerCHECKED_x64.lib
diff --git a/PxShared/lib/vc11win64/PxCudaContextManagerDEBUG_x64.lib b/PxShared/lib/vc11win64/PxCudaContextManagerDEBUG_x64.lib
index 0d53859b..c04cb66a 100644
--- a/PxShared/lib/vc11win64/PxCudaContextManagerDEBUG_x64.lib
+++ b/PxShared/lib/vc11win64/PxCudaContextManagerDEBUG_x64.lib
diff --git a/PxShared/lib/vc11win64/PxCudaContextManagerPROFILE_x64.lib b/PxShared/lib/vc11win64/PxCudaContextManagerPROFILE_x64.lib
index 064e7a4b..81ba5f84 100644
--- a/PxShared/lib/vc11win64/PxCudaContextManagerPROFILE_x64.lib
+++ b/PxShared/lib/vc11win64/PxCudaContextManagerPROFILE_x64.lib
diff --git a/PxShared/lib/vc11win64/PxCudaContextManager_x64.lib b/PxShared/lib/vc11win64/PxCudaContextManager_x64.lib
index 703186d8..a3379751 100644
--- a/PxShared/lib/vc11win64/PxCudaContextManager_x64.lib
+++ b/PxShared/lib/vc11win64/PxCudaContextManager_x64.lib
diff --git a/PxShared/lib/vc12win32/PxCudaContextManagerCHECKED_x86.lib b/PxShared/lib/vc12win32/PxCudaContextManagerCHECKED_x86.lib
index 20976f12..f015c42a 100644
--- a/PxShared/lib/vc12win32/PxCudaContextManagerCHECKED_x86.lib
+++ b/PxShared/lib/vc12win32/PxCudaContextManagerCHECKED_x86.lib
diff --git a/PxShared/lib/vc12win32/PxCudaContextManagerDEBUG_x86.lib b/PxShared/lib/vc12win32/PxCudaContextManagerDEBUG_x86.lib
index 0680c7bf..c44e038f 100644
--- a/PxShared/lib/vc12win32/PxCudaContextManagerDEBUG_x86.lib
+++ b/PxShared/lib/vc12win32/PxCudaContextManagerDEBUG_x86.lib
diff --git a/PxShared/lib/vc12win32/PxCudaContextManagerPROFILE_x86.lib b/PxShared/lib/vc12win32/PxCudaContextManagerPROFILE_x86.lib
index 5161e4d5..014b2d1e 100644
--- a/PxShared/lib/vc12win32/PxCudaContextManagerPROFILE_x86.lib
+++ b/PxShared/lib/vc12win32/PxCudaContextManagerPROFILE_x86.lib
diff --git a/PxShared/lib/vc12win32/PxCudaContextManager_x86.lib b/PxShared/lib/vc12win32/PxCudaContextManager_x86.lib
index ecf56ab1..75623e1a 100644
--- a/PxShared/lib/vc12win32/PxCudaContextManager_x86.lib
+++ b/PxShared/lib/vc12win32/PxCudaContextManager_x86.lib
diff --git a/PxShared/lib/vc12win64/PxCudaContextManagerCHECKED_x64.lib b/PxShared/lib/vc12win64/PxCudaContextManagerCHECKED_x64.lib
index 893d7d61..98464da1 100644
--- a/PxShared/lib/vc12win64/PxCudaContextManagerCHECKED_x64.lib
+++ b/PxShared/lib/vc12win64/PxCudaContextManagerCHECKED_x64.lib
diff --git a/PxShared/lib/vc12win64/PxCudaContextManagerDEBUG_x64.lib b/PxShared/lib/vc12win64/PxCudaContextManagerDEBUG_x64.lib
index 40cdf1da..b2cf8e64 100644
--- a/PxShared/lib/vc12win64/PxCudaContextManagerDEBUG_x64.lib
+++ b/PxShared/lib/vc12win64/PxCudaContextManagerDEBUG_x64.lib
diff --git a/PxShared/lib/vc12win64/PxCudaContextManagerPROFILE_x64.lib b/PxShared/lib/vc12win64/PxCudaContextManagerPROFILE_x64.lib
index 857faabe..1f0c18a6 100644
--- a/PxShared/lib/vc12win64/PxCudaContextManagerPROFILE_x64.lib
+++ b/PxShared/lib/vc12win64/PxCudaContextManagerPROFILE_x64.lib
diff --git a/PxShared/lib/vc12win64/PxCudaContextManager_x64.lib b/PxShared/lib/vc12win64/PxCudaContextManager_x64.lib
index 84af694f..336c5cef 100644
--- a/PxShared/lib/vc12win64/PxCudaContextManager_x64.lib
+++ b/PxShared/lib/vc12win64/PxCudaContextManager_x64.lib
diff --git a/PxShared/lib/vc14win32/PxCudaContextManagerCHECKED_x86.lib b/PxShared/lib/vc14win32/PxCudaContextManagerCHECKED_x86.lib
index 73df8d99..db56f881 100644
--- a/PxShared/lib/vc14win32/PxCudaContextManagerCHECKED_x86.lib
+++ b/PxShared/lib/vc14win32/PxCudaContextManagerCHECKED_x86.lib
diff --git a/PxShared/lib/vc14win32/PxCudaContextManagerDEBUG_x86.lib b/PxShared/lib/vc14win32/PxCudaContextManagerDEBUG_x86.lib
index ba7b928d..dbf64561 100644
--- a/PxShared/lib/vc14win32/PxCudaContextManagerDEBUG_x86.lib
+++ b/PxShared/lib/vc14win32/PxCudaContextManagerDEBUG_x86.lib
diff --git a/PxShared/lib/vc14win32/PxCudaContextManagerPROFILE_x86.lib b/PxShared/lib/vc14win32/PxCudaContextManagerPROFILE_x86.lib
index 6b72f604..ac616d84 100644
--- a/PxShared/lib/vc14win32/PxCudaContextManagerPROFILE_x86.lib
+++ b/PxShared/lib/vc14win32/PxCudaContextManagerPROFILE_x86.lib
diff --git a/PxShared/lib/vc14win32/PxCudaContextManager_x86.lib b/PxShared/lib/vc14win32/PxCudaContextManager_x86.lib
index 374155ad..cecdcd37 100644
--- a/PxShared/lib/vc14win32/PxCudaContextManager_x86.lib
+++ b/PxShared/lib/vc14win32/PxCudaContextManager_x86.lib
diff --git a/PxShared/lib/vc14win64/PxCudaContextManagerCHECKED_x64.lib b/PxShared/lib/vc14win64/PxCudaContextManagerCHECKED_x64.lib
index 65aa0739..3dac926f 100644
--- a/PxShared/lib/vc14win64/PxCudaContextManagerCHECKED_x64.lib
+++ b/PxShared/lib/vc14win64/PxCudaContextManagerCHECKED_x64.lib
diff --git a/PxShared/lib/vc14win64/PxCudaContextManagerDEBUG_x64.lib b/PxShared/lib/vc14win64/PxCudaContextManagerDEBUG_x64.lib
index cead933c..452bafd9 100644
--- a/PxShared/lib/vc14win64/PxCudaContextManagerDEBUG_x64.lib
+++ b/PxShared/lib/vc14win64/PxCudaContextManagerDEBUG_x64.lib
diff --git a/PxShared/lib/vc14win64/PxCudaContextManagerPROFILE_x64.lib b/PxShared/lib/vc14win64/PxCudaContextManagerPROFILE_x64.lib
index 7b26e367..3e735fe8 100644
--- a/PxShared/lib/vc14win64/PxCudaContextManagerPROFILE_x64.lib
+++ b/PxShared/lib/vc14win64/PxCudaContextManagerPROFILE_x64.lib
diff --git a/PxShared/lib/vc14win64/PxCudaContextManager_x64.lib b/PxShared/lib/vc14win64/PxCudaContextManager_x64.lib
index ed956179..919631bf 100644
--- a/PxShared/lib/vc14win64/PxCudaContextManager_x64.lib
+++ b/PxShared/lib/vc14win64/PxCudaContextManager_x64.lib
diff --git a/PxShared/src/cudamanager/include/GpuDispatcher.h b/PxShared/src/cudamanager/include/GpuDispatcher.h
index aedb345f..10c412fb 100644
--- a/PxShared/src/cudamanager/include/GpuDispatcher.h
+++ b/PxShared/src/cudamanager/include/GpuDispatcher.h
@@ -258,8 +258,6 @@ public:
 	~PxGpuWorkerThread();
 
 	void					setCudaContext(PxCudaContextManager& ctx);
-	void					emitStartEvent(const char *id);
-	void					emitStopEvent(const char *id);
 
 	/* API to TaskManager */
 	void					startSimulation();
diff --git a/PxShared/src/task/src/TaskManager.cpp b/PxShared/src/task/src/TaskManager.cpp
index ffcbfcd1..c6210bd8 100644
--- a/PxShared/src/task/src/TaskManager.cpp
+++ b/PxShared/src/task/src/TaskManager.cpp
@@ -168,9 +168,6 @@ public:
 	void	decrReference( PxLightCpuTask& lighttask );
 	void	addReference( PxLightCpuTask& lighttask );		
 
-	void	emitStartEvent( PxBaseTask& basetask, uint32_t threadId=0);
-	void	emitStopEvent( PxBaseTask& basetask, uint32_t threadId=0);
-
 	PxErrorCallback&			mErrorCallback;
 	PxCpuDispatcher           *mCpuDispatcher;
 	PxGpuDispatcher           *mGpuDispatcher;		
@@ -304,35 +301,6 @@ void PxTaskMgr::addReference(PxLightCpuTask& lighttask)
 	shdfnd::atomicIncrement(&lighttask.mRefCount);
 }
 
-void PxTaskMgr::emitStartEvent(PxBaseTask& basetask, uint32_t threadId)
-{
-#if DOT_LOG
-	currentTask = &basetask;
-#endif
-
-	PxBaseTask* tmp = &basetask;
-	PX_UNUSED(tmp);
-	PX_UNUSED(threadId);
-
-	/* This does not need a lock! */
-#if PX_SUPPORT_PXTASK_PROFILING
-	//PX_COMPILE_TIME_ASSERT(sizeof(PxProfileEventId::mEventId) == sizeof(PxBaseTask::mEventID));
-	PX_PROFILE_START_CROSSTHREAD(basetask.getName(),0);
-#endif
-}
-
-void PxTaskMgr::emitStopEvent(PxBaseTask& basetask, uint32_t threadId)
-{
-	PxBaseTask* tmp = &basetask;
-	PX_UNUSED(tmp);
-	PX_UNUSED(threadId);
-
-	/* This does not need a lock! */
-#if PX_SUPPORT_PXTASK_PROFILING
-	//PX_COMPILE_TIME_ASSERT(sizeof(PxProfileEventId::mEventId) == sizeof(PxBaseTask::mEventID));
-	PX_PROFILE_STOP_CROSSTHREAD(basetask.getName(),0);
-#endif
-}
 
 /*
  * Called by the owner (Scene) at the start of every frame, before