PhysX 3.4, APEX 1.4 patch release @23879214

7 files changed, 102 insertions, 14 deletions

diff --git a/PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp b/PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp
index e3499a6e..4e4655c1 100644
--- a/PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp
+++ b/PxShared/src/pvd/src/PxPvdDefaultFileTransport.cpp
@@ -112,11 +112,112 @@ void PvdDefaultFileTransport::release()
 	PX_DELETE(this);
 }
 
+
+
+
+class NullFileTransport : public physx::PxPvdTransport, public physx::shdfnd::UserAllocated
+{
+	PX_NOCOPY(NullFileTransport)
+  public:
+	NullFileTransport();
+	virtual ~NullFileTransport();
+
+	virtual bool connect();
+	virtual void disconnect();
+	virtual bool isConnected();
+
+	virtual bool write(const uint8_t* inBytes, uint32_t inLength);
+
+	virtual PxPvdTransport& lock();
+	virtual void unlock();
+
+	virtual void flush();
+
+	virtual uint64_t getWrittenDataSize();
+
+	virtual void release();
+
+  private:
+	bool mConnected;
+	uint64_t mWrittenData;
+	physx::shdfnd::Mutex mMutex;
+	bool mLocked; // for debug, remove it when finished
+};
+
+NullFileTransport::NullFileTransport() : mConnected(false), mWrittenData(0), mLocked(false)
+{
+}
+
+NullFileTransport::~NullFileTransport()
+{
+}
+
+bool NullFileTransport::connect()
+{
+	mConnected = true;
+	return true;
+}
+
+void NullFileTransport::disconnect()
+{
+	mConnected = false;
+}
+
+bool NullFileTransport::isConnected()
+{
+	return mConnected;
+}
+
+bool NullFileTransport::write(const uint8_t* /*inBytes*/, uint32_t inLength)
+{
+	PX_ASSERT(mLocked);
+	if(mConnected)
+	{
+		uint32_t len = inLength;
+		mWrittenData += len;
+		return len == inLength;
+	}
+	else
+		return false;
+}
+
+PxPvdTransport& NullFileTransport::lock()
+{
+	mMutex.lock();
+	PX_ASSERT(!mLocked);
+	mLocked = true;
+	return *this;
+}
+
+void NullFileTransport::unlock()
+{
+	PX_ASSERT(mLocked);
+	mLocked = false;
+	mMutex.unlock();
+}
+
+void NullFileTransport::flush()
+{
+}
+
+uint64_t NullFileTransport::getWrittenDataSize()
+{
+	return mWrittenData;
+}
+
+void NullFileTransport::release()
+{
+	PX_DELETE(this);
+}
+
 } // namespace pvdsdk
 
 PxPvdTransport* PxDefaultPvdFileTransportCreate(const char* name)
 {
-	return PX_NEW(pvdsdk::PvdDefaultFileTransport)(name);
+	if(name)
+		return PX_NEW(pvdsdk::PvdDefaultFileTransport)(name);
+	else
+		return PX_NEW(pvdsdk::NullFileTransport)();
 }
 
 } // namespace physx
diff --git a/PxShared/src/pvd/src/PxPvdImpl.cpp b/PxShared/src/pvd/src/PxPvdImpl.cpp
index 9fa82a0f..d9b45945 100644
--- a/PxShared/src/pvd/src/PxPvdImpl.cpp
+++ b/PxShared/src/pvd/src/PxPvdImpl.cpp
@@ -91,7 +91,6 @@ PvdImpl::PvdImpl()
 , mMemClient(NULL)
 , mIsConnected(false)
 , mIsNVTXSupportEnabled(true)
-, mNVTXContext(0)
 , mNextStreamId(1)
 , mProfileClient(NULL)
 , mProfileZone(NULL)
diff --git a/PxShared/src/pvd/src/PxPvdImpl.h b/PxShared/src/pvd/src/PxPvdImpl.h
index 64d4e169..2bf52edf 100644
--- a/PxShared/src/pvd/src/PxPvdImpl.h
+++ b/PxShared/src/pvd/src/PxPvdImpl.h
@@ -206,7 +206,6 @@ class PvdImpl : public PsPvd, public shdfnd::UserAllocated
 	PxPvdInstrumentationFlags			mFlags;
 	bool								mIsConnected;
 	bool								mIsNVTXSupportEnabled;
-	uint32_t							mNVTXContext;
 	uint64_t							mNextStreamId;
 	physx::profile::PxProfileZoneManager*mProfileZoneManager;
 	PvdProfileZoneClient*				mProfileClient;
diff --git a/PxShared/src/pvd/src/PxPvdMemClient.cpp b/PxShared/src/pvd/src/PxPvdMemClient.cpp
index 05b7899b..5e380fcc 100644
--- a/PxShared/src/pvd/src/PxPvdMemClient.cpp
+++ b/PxShared/src/pvd/src/PxPvdMemClient.cpp
@@ -66,10 +66,6 @@ PvdUserRenderer* PvdMemClient::getUserRender()
 	return NULL;
 }
 
-void PvdMemClient::setObjectRegistrar(ObjectRegistrar*)
-{
-}
-
 bool PvdMemClient::isConnected() const
 {
 	return mIsConnected;
diff --git a/PxShared/src/pvd/src/PxPvdMemClient.h b/PxShared/src/pvd/src/PxPvdMemClient.h
index 37ac4ff7..ac3ca444 100644
--- a/PxShared/src/pvd/src/PxPvdMemClient.h
+++ b/PxShared/src/pvd/src/PxPvdMemClient.h
@@ -60,8 +60,6 @@ class PvdMemClient : public PvdClient,
 
 	PvdDataStream* getDataStream();
 	PvdUserRenderer* getUserRender();
-	void setObjectRegistrar(ObjectRegistrar*);
-	void sendMemEvents();
 
 	// memory event
 	void onAllocation(size_t size, const char* typeName, const char* filename, int line, void* allocatedMemory);
diff --git a/PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp b/PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp
index 8d8582cf..ad929108 100644
--- a/PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp
+++ b/PxShared/src/pvd/src/PxPvdProfileZoneClient.cpp
@@ -109,10 +109,6 @@ PvdUserRenderer* PvdProfileZoneClient::getUserRender()
 	return NULL;
 }
 
-void PvdProfileZoneClient::setObjectRegistrar(ObjectRegistrar*)
-{
-}
-
 bool PvdProfileZoneClient::isConnected() const
 {
 	return mIsConnected;
diff --git a/PxShared/src/pvd/src/PxPvdProfileZoneClient.h b/PxShared/src/pvd/src/PxPvdProfileZoneClient.h
index 4484997e..96073e9a 100644
--- a/PxShared/src/pvd/src/PxPvdProfileZoneClient.h
+++ b/PxShared/src/pvd/src/PxPvdProfileZoneClient.h
@@ -57,7 +57,6 @@ class PvdProfileZoneClient : public PvdClient, public profile::PxProfileZoneHand
 
 	PvdDataStream* getDataStream();
 	PvdUserRenderer* getUserRender();
-	void setObjectRegistrar(ObjectRegistrar*);
 
 	// PxProfileZoneHandler
 	void onZoneAdded(profile::PxProfileZone& inSDK);