1.6: Fixed a bunch of vertex-related memory leaks

Author: Dutchman101

Client/core/CAdditionalVertexStreamManager.cpp

@@ -67,6 +67,17 @@ CAdditionalVertexStreamManager::CAdditionalVertexStreamManager()
 ///////////////////////////////////////////////////////////////
 CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager()
 {
+    SAFE_RELEASE(m_pOldVertexDeclaration);
+
+    for (std::map<void*, SAdditionalStreamInfo>::iterator iter = m_AdditionalStreamInfoMap.begin(); iter != m_AdditionalStreamInfoMap.end(); ++iter)
+    {
+        SAdditionalStreamInfo& info = iter->second;
+        SAFE_RELEASE(info.pStreamData);
+        SAFE_RELEASE(info.pVertexDeclaration);
+    }
+
+    m_AdditionalStreamInfoMap.clear();
+    m_pDevice = NULL;
 }
 
 ///////////////////////////////////////////////////////////////
@@ -83,6 +94,20 @@ CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetSingleton()
     return ms_Singleton;
 }
 
+CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetExistingSingleton()
+{
+    return ms_Singleton;
+}
+
+void CAdditionalVertexStreamManager::DestroySingleton()
+{
+    if (ms_Singleton)
+    {
+        delete ms_Singleton;
+        ms_Singleton = NULL;
+    }
+}
+
 ///////////////////////////////////////////////////////////////
 //
 // CAdditionalVertexStreamManager::OnDeviceCreate
@@ -105,6 +130,9 @@ void CAdditionalVertexStreamManager::OnDeviceCreate(IDirect3DDevice9* pDevice)
 bool CAdditionalVertexStreamManager::MaybeSetAdditionalVertexStream(D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices,
                                                                     UINT startIndex, UINT primCount)
 {
+    if (!m_pDevice)
+        return false;
+
     // Cache info
     SCurrentStateInfo state;
 
@@ -188,6 +216,9 @@ void CAdditionalVertexStreamManager::SetAdditionalVertexStream(SCurrentStateInfo
 ///////////////////////////////////////////////////////////////
 void CAdditionalVertexStreamManager::MaybeUnsetAdditionalVertexStream()
 {
+    if (!m_pDevice)
+        return;
+
     HRESULT hr;
     if (m_pOldVertexDeclaration)
     {
@@ -360,6 +391,9 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
 /////////////////////////////////////////////////////////////
 bool CAdditionalVertexStreamManager::UpdateCurrentStateInfo(SCurrentStateInfo& state)
 {
+    if (!m_pDevice)
+        return false;
+
     // Get vertex declaration
     if (FAILED(m_pDevice->GetVertexDeclaration(&state.decl.pVertexDeclaration)))
         return false;
@@ -466,13 +500,16 @@ SAdditionalStreamInfo* CAdditionalVertexStreamManager::CreateAdditionalStreamInf
         declNew->Usage = D3DDECLUSAGE_NORMAL;
         declNew->UsageIndex = 0;
         if (FAILED(m_pDevice->CreateVertexDeclaration(elements, &info.pVertexDeclaration)))
-            return false;
+            return nullptr;
 
         // Create new stream
         info.Stride = sizeof(float) * 3;
         UINT Size2 = ConvertPTSize(state.decl.VertexBufferDesc1.Size);
         if (FAILED(m_pDevice->CreateVertexBuffer(Size2, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &info.pStreamData, NULL)))
-            return false;
+        {
+            SAFE_RELEASE(info.pVertexDeclaration);
+            return nullptr;
+        }
 
         // Save info
         MapSet(m_AdditionalStreamInfoMap, state.stream1.pStreamData, info);
@@ -515,3 +552,4 @@ void CAdditionalVertexStreamManager::OnVertexBufferRangeInvalidated(IDirect3DVer
         pAdditionalInfo->ConvertedRanges.UnsetRange(Offset, Size);
     }
 }
+

Client/core/CAdditionalVertexStreamManager.h

@@ -84,6 +84,8 @@ class CAdditionalVertexStreamManager
     void OnVertexBufferRangeInvalidated(IDirect3DVertexBuffer9* pStreamData, uint Offset, uint Size);
 
     static CAdditionalVertexStreamManager* GetSingleton();
+    static CAdditionalVertexStreamManager* GetExistingSingleton();
+    static void DestroySingleton();
 
 protected:
     void SetAdditionalVertexStream(SCurrentStateInfo& renderState);

Client/core/CVertexStreamBoundingBoxManager.cpp

@@ -59,6 +59,8 @@ CVertexStreamBoundingBoxManager::CVertexStreamBoundingBoxManager()
 ///////////////////////////////////////////////////////////////
 CVertexStreamBoundingBoxManager::~CVertexStreamBoundingBoxManager()
 {
+    m_StreamBoundsInfoMap.clear();
+    m_pDevice = NULL;
 }
 
 ///////////////////////////////////////////////////////////////
@@ -75,6 +77,20 @@ CVertexStreamBoundingBoxManager* CVertexStreamBoundingBoxManager::GetSingleton()
     return ms_Singleton;
 }
 
+CVertexStreamBoundingBoxManager* CVertexStreamBoundingBoxManager::GetExistingSingleton()
+{
+    return ms_Singleton;
+}
+
+void CVertexStreamBoundingBoxManager::DestroySingleton()
+{
+    if (ms_Singleton)
+    {
+        delete ms_Singleton;
+        ms_Singleton = NULL;
+    }
+}
+
 ///////////////////////////////////////////////////////////////
 //
 // CVertexStreamBoundingBoxManager::OnDeviceCreate
@@ -97,6 +113,9 @@ void CVertexStreamBoundingBoxManager::OnDeviceCreate(IDirect3DDevice9* pDevice)
 float CVertexStreamBoundingBoxManager::GetDistanceSqToGeometry(D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices,
                                                                UINT startIndex, UINT primCount)
 {
+    if (!m_pDevice)
+        return 0.f;
+
     // Cache info
     SCurrentStateInfo2 state;
 
@@ -314,6 +333,9 @@ bool CVertexStreamBoundingBoxManager::ComputeVertexStreamBoundingBox(SCurrentSta
 /////////////////////////////////////////////////////////////
 bool CVertexStreamBoundingBoxManager::CheckCanDoThis(SCurrentStateInfo2& state)
 {
+    if (!m_pDevice)
+        return false;
+
     // Only tri-lists and tri-strips
     if (state.args.PrimitiveType != D3DPT_TRIANGLESTRIP && state.args.PrimitiveType != D3DPT_TRIANGLELIST)
         return false;

Client/core/CVertexStreamBoundingBoxManager.h

@@ -75,14 +75,19 @@ struct SCurrentStateInfo2
     SCurrentStateInfo2(const SCurrentStateInfo2& other);
     SCurrentStateInfo2& operator=(const SCurrentStateInfo2& other);
 
+    void ReleaseComReferences()
+    {
+        SAFE_RELEASE(stream.pStreamData);
+        SAFE_RELEASE(pIndexData);
+        SAFE_RELEASE(decl.pVertexDeclaration);
+    }
+
 public:
     SCurrentStateInfo2() { ZERO_POD_STRUCT(this); }
 
     ~SCurrentStateInfo2()
     {
-        SAFE_RELEASE(stream.pStreamData);
-        SAFE_RELEASE(pIndexData);
-        SAFE_RELEASE(decl.pVertexDeclaration);
+        ReleaseComReferences();
     }
 
     // Info to DrawIndexPrimitive
@@ -132,6 +137,8 @@ class CVertexStreamBoundingBoxManager
     void  OnVertexBufferRangeInvalidated(IDirect3DVertexBuffer9* pStreamData, uint Offset, uint Size);
 
     static CVertexStreamBoundingBoxManager* GetSingleton();
+    static CVertexStreamBoundingBoxManager* GetExistingSingleton();
+    static void DestroySingleton();
 
 protected:
     float CalcDistanceSq(const SCurrentStateInfo2& state, const CBox& boundingBox);

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -57,6 +57,9 @@ void CDirect3DEvents9::OnDirect3DDeviceDestroy(IDirect3DDevice9* pDevice)
     // Destroy the GUI elements
     CLocalGUI::GetSingleton().DestroyObjects();
 
+    CAdditionalVertexStreamManager::DestroySingleton();
+    CVertexStreamBoundingBoxManager::DestroySingleton();
+
     // De-initialize the GUI manager (destroying is done on Exit)
     CCore::GetSingleton().DeinitGUI();
 }
@@ -489,8 +492,11 @@ HRESULT CDirect3DEvents9::DrawIndexedPrimitiveShader(IDirect3DDevice9* pDevice,
         if (pShaderInstance->m_pEffectWrap->m_pEffectTemplate->m_bRequiresNormals)
         {
             // Find/create/set additional vertex stream
-            CAdditionalVertexStreamManager::GetSingleton()->MaybeSetAdditionalVertexStream(PrimitiveType, BaseVertexIndex, MinVertexIndex, NumVertices,
-                                                                                           startIndex, primCount);
+            if (CAdditionalVertexStreamManager* pAdditionalStreamManager = CAdditionalVertexStreamManager::GetExistingSingleton())
+            {
+                pAdditionalStreamManager->MaybeSetAdditionalVertexStream(PrimitiveType, BaseVertexIndex, MinVertexIndex, NumVertices, startIndex,
+                                                                          primCount);
+            }
         }
 
         // Apply custom parameters
@@ -541,7 +547,8 @@ HRESULT CDirect3DEvents9::DrawIndexedPrimitiveShader(IDirect3DDevice9* pDevice,
         }
 
         // Unset additional vertex stream
-        CAdditionalVertexStreamManager::GetSingleton()->MaybeUnsetAdditionalVertexStream();
+        if (CAdditionalVertexStreamManager* pAdditionalStreamManager = CAdditionalVertexStreamManager::GetExistingSingleton())
+            pAdditionalStreamManager->MaybeUnsetAdditionalVertexStream();
     }
 
     return D3D_OK;
@@ -572,7 +579,8 @@ void CDirect3DEvents9::CloseActiveShader()
     pDevice->SetPixelShader(NULL);
 
     // Unset additional vertex stream
-    CAdditionalVertexStreamManager::GetSingleton()->MaybeUnsetAdditionalVertexStream();
+    if (CAdditionalVertexStreamManager* pAdditionalStreamManager = CAdditionalVertexStreamManager::GetExistingSingleton())
+        pAdditionalStreamManager->MaybeUnsetAdditionalVertexStream();
 }
 
 /////////////////////////////////////////////////////////////

Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp

@@ -46,8 +46,10 @@ CProxyDirect3DVertexBuffer::CProxyDirect3DVertexBuffer(IDirect3DDevice9* InD3DDe
 /////////////////////////////////////////////////////////////
 CProxyDirect3DVertexBuffer::~CProxyDirect3DVertexBuffer()
 {
-    CAdditionalVertexStreamManager::GetSingleton()->OnVertexBufferDestroy(m_pOriginal);
-    CVertexStreamBoundingBoxManager::GetSingleton()->OnVertexBufferDestroy(m_pOriginal);
+    if (CAdditionalVertexStreamManager* pManager = CAdditionalVertexStreamManager::GetExistingSingleton())
+        pManager->OnVertexBufferDestroy(m_pOriginal);
+    if (CVertexStreamBoundingBoxManager* pBoundingBoxManager = CVertexStreamBoundingBoxManager::GetExistingSingleton())
+        pBoundingBoxManager->OnVertexBufferDestroy(m_pOriginal);
 
     m_stats.iCurrentCount--;
     m_stats.iCurrentBytes -= m_iMemUsed;
@@ -105,8 +107,10 @@ HRESULT CProxyDirect3DVertexBuffer::Lock(UINT OffsetToLock, UINT SizeToLock, voi
 
     if ((Flags & D3DLOCK_READONLY) == 0)
     {
-        CAdditionalVertexStreamManager::GetSingleton()->OnVertexBufferRangeInvalidated(m_pOriginal, OffsetToLock, SizeToLock);
-        CVertexStreamBoundingBoxManager::GetSingleton()->OnVertexBufferRangeInvalidated(m_pOriginal, OffsetToLock, SizeToLock);
+        if (CAdditionalVertexStreamManager* pManager = CAdditionalVertexStreamManager::GetExistingSingleton())
+            pManager->OnVertexBufferRangeInvalidated(m_pOriginal, OffsetToLock, SizeToLock);
+        if (CVertexStreamBoundingBoxManager* pBoundingBoxManager = CVertexStreamBoundingBoxManager::GetExistingSingleton())
+            pBoundingBoxManager->OnVertexBufferRangeInvalidated(m_pOriginal, OffsetToLock, SizeToLock);
     }
 
     *ppbData = NULL;