PhysX 3.4, APEX 1.4 patch release @22017166

6 files changed, 124 insertions, 65 deletions

diff --git a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.cpp b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.cpp
index d5978518..82b7b891 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.cpp
+++ b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.cpp
@@ -28,7 +28,6 @@
 // Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
 
 
-#include "task/PxTask.h"
 #include "ExtDefaultCpuDispatcher.h"
 #include "ExtCpuWorkerThread.h"
 #include "ExtTaskQueueHelper.h"
@@ -109,7 +108,6 @@ Ext::DefaultCpuDispatcher::DefaultCpuDispatcher(PxU32 numThreads, PxU32* affinit
 	}
 }
 
-
 Ext::DefaultCpuDispatcher::~DefaultCpuDispatcher()
 {
 	for(PxU32 i = 0; i < mNumThreads; ++i)
@@ -129,22 +127,18 @@ Ext::DefaultCpuDispatcher::~DefaultCpuDispatcher()
 		PX_FREE(mThreadNames);
 }
 
-
 void Ext::DefaultCpuDispatcher::submitTask(PxBaseTask& task)
 {
-	Ps::Thread::Id currentThread = Ps::Thread::getId();
 	if(!mNumThreads)
 	{
 		// no worker threads, run directly
-		if(mRunProfiled)
-			task.runProfiled(PxU32(currentThread));
-		else
-			task.run();
+		runTask(task);
 		task.release();
 		return;
 	}	
 
 	// TODO: Could use TLS to make this more efficient
+	const Ps::Thread::Id currentThread = Ps::Thread::getId();
 	for(PxU32 i = 0; i < mNumThreads; ++i)
 	{
 		if(mWorkerThreads[i].tryAcceptJobToLocalQueue(task, currentThread))
@@ -169,34 +163,16 @@ PxBaseTask* Ext::DefaultCpuDispatcher::fetchNextTask()
 	return task;
 }
 
-void Ext::DefaultCpuDispatcher::runTask(PxBaseTask& task)
-{
-	if(mRunProfiled)
-	{
-		const PxU32 threadId = PxU32(Ps::Thread::getId());
-		task.runProfiled(threadId);
-	}
-	else
-		task.run();
-}
-
-PxU32 Ext::DefaultCpuDispatcher::getWorkerCount() const
-{
-	return mNumThreads;	
-}
-
 void Ext::DefaultCpuDispatcher::release()
 {
 	PX_DELETE(this);
 }
 
-
 PxBaseTask* Ext::DefaultCpuDispatcher::getJob(void)
 {
 	return TaskQueueHelper::fetchTask(mJobList, mQueueEntryPool);
 }
 
-
 PxBaseTask* Ext::DefaultCpuDispatcher::stealJob()
 {
 	PxBaseTask* ret = NULL;
@@ -212,7 +188,6 @@ PxBaseTask* Ext::DefaultCpuDispatcher::stealJob()
 	return ret;
 }
 
-
 void Ext::DefaultCpuDispatcher::resetWakeSignal()
 {
 	mWorkReady.reset();
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.h b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.h
index 69369c6b..902241e1 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.h
+++ b/PhysX_3.4/Source/PhysXExtensions/src/ExtDefaultCpuDispatcher.h
@@ -37,6 +37,8 @@
 #include "PsSList.h"
 #include "PxDefaultCpuDispatcher.h"
 #include "ExtSharedQueueEntryPool.h"
+#include "foundation/PxProfiler.h"
+#include "task/PxTask.h"
 
 namespace physx
 {
@@ -55,50 +57,59 @@ namespace Ext
 		friend class TaskQueueHelper;
 
 	private:
-		DefaultCpuDispatcher() : mQueueEntryPool(0) {}
-		~DefaultCpuDispatcher();
-
+												DefaultCpuDispatcher() : mQueueEntryPool(0) {}
+												~DefaultCpuDispatcher();
 	public:
-		DefaultCpuDispatcher(PxU32 numThreads, PxU32* affinityMasks);
+												DefaultCpuDispatcher(PxU32 numThreads, PxU32* affinityMasks);
 
 		//---------------------------------------------------------------------------------
-		// physx::CpuDispatcher implementation
+		// PxCpuDispatcher implementation
 		//---------------------------------------------------------------------------------
-		virtual void submitTask(PxBaseTask& task);
-		virtual PxU32 getWorkerCount() const;
+		virtual			void					submitTask(PxBaseTask& task);
+		virtual			PxU32					getWorkerCount()	const	{ return mNumThreads;	}
 
 		//---------------------------------------------------------------------------------
 		// PxDefaultCpuDispatcher implementation
 		//---------------------------------------------------------------------------------
-		virtual void release();
+		virtual			void					release();
 
-		virtual void setRunProfiled(bool runProfiled) { mRunProfiled = runProfiled; }
+		virtual			void					setRunProfiled(bool runProfiled) { mRunProfiled = runProfiled; }
 
-		virtual bool getRunProfiled() const { return mRunProfiled; }
+		virtual			bool					getRunProfiled()	const	{ return mRunProfiled;	}
 
 		//---------------------------------------------------------------------------------
 		// DefaultCpuDispatcher
 		//---------------------------------------------------------------------------------
-		PxBaseTask*		getJob();
-		PxBaseTask*		stealJob();
-		PxBaseTask*		fetchNextTask();
-		void					runTask(PxBaseTask& task);
-
-    	void					waitForWork() { mWorkReady.wait(); }
-	    void					resetWakeSignal();
+						PxBaseTask*				getJob();
+						PxBaseTask*				stealJob();
+						PxBaseTask*				fetchNextTask();
+		PX_FORCE_INLINE	void					runTask(PxBaseTask& task)
+												{
+#if PX_SUPPORT_PXTASK_PROFILING
+													if(mRunProfiled)
+													{
+														PX_PROFILE_ZONE(task.getName(), task.getContextId());
+														task.run();
+													}
+													else
+#endif
+														task.run();
+												}
 
-		static void				getAffinityMasks(PxU32* affinityMasks, PxU32 threadCount);
+    					void					waitForWork() { mWorkReady.wait(); }
+						void					resetWakeSignal();
 
+		static			void					getAffinityMasks(PxU32* affinityMasks, PxU32 threadCount);
 
 	protected:
-				CpuWorkerThread*				mWorkerThreads;
-				SharedQueueEntryPool<>			mQueueEntryPool;
-				Ps::SList						mJobList;
-				Ps::Sync						mWorkReady;
-				PxU8*							mThreadNames;
-				PxU32							mNumThreads;
-				bool							mShuttingDown;
-				bool							mRunProfiled;
+						CpuWorkerThread*		mWorkerThreads;
+						SharedQueueEntryPool<>	mQueueEntryPool;
+						Ps::SList				mJobList;
+						Ps::Sync				mWorkReady;
+						PxU8*					mThreadNames;
+						PxU32					mNumThreads;
+						bool					mShuttingDown;
+						bool					mRunProfiled;
 	};
 
 #if PX_VC
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/ExtExtensions.cpp b/PhysX_3.4/Source/PhysXExtensions/src/ExtExtensions.cpp
index 35ef02fe..8140dbd3 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/ExtExtensions.cpp
+++ b/PhysX_3.4/Source/PhysXExtensions/src/ExtExtensions.cpp
@@ -39,9 +39,8 @@
 #include "ExtSphericalJoint.h"
 #include "PxRepXSerializer.h"
 #include "SnRepXCoreSerializer.h"
-#include "SnRepXSerializerImpl.h"
+#include "SnJointRepXSerializer.h"
 #include "PxExtensionMetaDataObjects.h"
-#include "PxJointRepXSerializer.h"
 #include "PxSerializer.h"
 #include "ExtSerialization.h"
 
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
index 30db1038..adf4f4f6 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.cpp
@@ -29,8 +29,7 @@
 #include "PxMetaDataObjects.h"
 #include "PxExtensionMetaDataObjects.h"
 #include "ExtJointMetaDataExtensions.h" 
-#include "SnRepXSerializerImpl.h"
-#include "PxJointRepXSerializer.h"
+#include "SnJointRepXSerializer.h"
 
 namespace physx { 
 
@@ -127,7 +126,7 @@ namespace physx {
 		writeAllProperties( inObj, inWriter, inTempBuffer, *inCollection );
 	}
 	
-	// explicit instantiations
+	// explicit template instantiations
 	template struct PxJointRepXSerializer<PxFixedJoint>;
 	template struct PxJointRepXSerializer<PxDistanceJoint>;
 	template struct PxJointRepXSerializer<PxD6Joint>;
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h
new file mode 100644
index 00000000..24bb77f2
--- /dev/null
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnJointRepXSerializer.h
@@ -0,0 +1,72 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+#ifndef SN_JOINT_REPX_SERIALIZER_H
+#define SN_JOINT_REPX_SERIALIZER_H
+/** \addtogroup RepXSerializers
+  @{
+*/
+
+#include "extensions/PxRepXSimpleType.h"
+#include "SnRepXSerializerImpl.h"
+
+#if !PX_DOXYGEN
+namespace physx
+{
+#endif
+	
+	class XmlReader;
+	class XmlMemoryAllocator;
+	class XmlWriter;
+	class MemoryBuffer;
+	
+	template<typename TJointType>
+	struct PxJointRepXSerializer : public RepXSerializerImpl<TJointType>
+	{
+		PxJointRepXSerializer(PxAllocatorCallback& inAllocator) : RepXSerializerImpl<TJointType>(inAllocator) {}
+		virtual PxRepXObject fileToObject(XmlReader& inReader, XmlMemoryAllocator& inAllocator, PxRepXInstantiationArgs& inArgs, PxCollection* inCollection);
+		virtual void objectToFileImpl(const TJointType* inObj, PxCollection* inCollection, XmlWriter& inWriter, MemoryBuffer& inTempBuffer, PxRepXInstantiationArgs&);
+		virtual TJointType* allocateObject(PxRepXInstantiationArgs&) { return NULL; }
+	};
+
+#if PX_SUPPORT_EXTERN_TEMPLATE
+	// explicit template instantiations declarations
+	extern template struct PxJointRepXSerializer<PxD6Joint>;
+	extern template struct PxJointRepXSerializer<PxDistanceJoint>;
+	extern template struct PxJointRepXSerializer<PxFixedJoint>;
+	extern template struct PxJointRepXSerializer<PxPrismaticJoint>;
+	extern template struct PxJointRepXSerializer<PxRevoluteJoint>;
+	extern template struct PxJointRepXSerializer<PxSphericalJoint>;
+#endif
+
+#if !PX_DOXYGEN
+} // namespace physx
+#endif
+
+/** @} */
+#endif
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
index 5b59926d..bf8a250a 100644
--- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
+++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXCoreSerializer.h
@@ -39,9 +39,6 @@ namespace physx
 {
 #endif
 
-	template<typename TLiveType>
-	struct RepXSerializerImpl;
-	
 	class XmlReader;
 	class XmlMemoryAllocator;
 	class XmlWriter;
@@ -140,11 +137,17 @@ namespace physx
 	template<typename TParticleType>
 	struct PxParticleRepXSerializer : RepXSerializerImpl<TParticleType>
 	{
-		PxParticleRepXSerializer( PxAllocatorCallback& inCallback ) : RepXSerializerImpl<TParticleType>( inCallback ) {}
-		virtual void objectToFileImpl( const TParticleType*, PxCollection*, XmlWriter&, MemoryBuffer&, PxRepXInstantiationArgs& );
-		virtual PxRepXObject fileToObject( XmlReader&, XmlMemoryAllocator&, PxRepXInstantiationArgs&, PxCollection* );
-		virtual TParticleType* allocateObject( PxRepXInstantiationArgs& ) { return NULL; }	
+		PxParticleRepXSerializer(PxAllocatorCallback& inCallback) : RepXSerializerImpl<TParticleType>(inCallback) {}
+		virtual void objectToFileImpl(const TParticleType*, PxCollection*, XmlWriter&, MemoryBuffer&, PxRepXInstantiationArgs&);
+		virtual PxRepXObject fileToObject(XmlReader&, XmlMemoryAllocator&, PxRepXInstantiationArgs&, PxCollection*);
+		virtual TParticleType* allocateObject(PxRepXInstantiationArgs&) { return NULL; }
 	};
+
+#if PX_SUPPORT_EXTERN_TEMPLATE
+	// explicit template instantiations declarations
+	extern template struct PxParticleRepXSerializer<PxParticleSystem>;
+	extern template struct PxParticleRepXSerializer<PxParticleFluid>;
+#endif
 #endif
 
 #if !PX_DOXYGEN