Improve texture/shader loading system

Author: Dutchman101

Client/game_sa/CModelInfoSA.cpp

@@ -1552,7 +1552,42 @@ bool CModelInfoSA::SetCustomModel(RpClump* pClump)
             break;
     }
 
-    m_pCustomClump = success ? pClump : nullptr;
+    if (success)
+    {
+        m_pCustomClump = pClump;
+
+        // Rebind texture pointers in the GAME's clump to current TXD textures.
+        // ReplaceModel clones the input clump, so we must rebind the ACTUAL clump the game is using.
+        // This is needed because the TXD may contain replacement textures (via engineImportTXD),
+        // but the DFF's materials still point to old/original textures from when it was loaded.
+        // Without this fix, shader texture replacement fails on custom DFF models.
+        eModelInfoType modelType = GetModelType();
+        switch (modelType)
+        {
+            case eModelInfoType::PED:
+            case eModelInfoType::WEAPON:
+            case eModelInfoType::VEHICLE:
+            case eModelInfoType::CLUMP:
+            case eModelInfoType::UNKNOWN:
+            {
+                RpClump* pGameClump = reinterpret_cast<RpClump*>(GetRwObject());
+                if (pGameClump && pGame)
+                {
+                    CRenderWare* pRenderWare = pGame->GetRenderWare();
+                    if (pRenderWare)
+                        pRenderWare->RebindClumpTexturesToTxd(pGameClump, GetTextureDictionaryID());
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    else
+    {
+        m_pCustomClump = nullptr;
+    }
+
     return success;
 }
 
@@ -1654,7 +1689,23 @@ void CModelInfoSA::MakeCustomModel()
     // We have a custom model?
     if (m_pCustomClump)
     {
-        SetCustomModel(m_pCustomClump);
+        // Store and clear m_pCustomClump BEFORE calling SetCustomModel to prevent recursive calls.
+        // SetCustomModel may trigger LoadAllRequestedModels which can recursively call MakeCustomModel
+        // on the same model (via the streaming hook) if the custom DFF lacks embedded collision.
+        RpClump* pClumpToSet = m_pCustomClump;
+        m_pCustomClump = nullptr;
+        
+        if (!SetCustomModel(pClumpToSet))
+        {
+            // SetCustomModel failed, restore the custom clump for retry on next stream-in
+            m_pCustomClump = pClumpToSet;
+        }
+        else
+        {
+            // Preserve the custom clump pointer for restream/retry paths
+            m_pCustomClump = pClumpToSet;
+            // Note: SetCustomModel now handles RebindClumpTexturesToTxd internally after successful replacement
+        }
     }
 
     // Custom collision model is not NULL and it's different from the original?

Client/game_sa/CRenderWareSA.ShaderSupport.cpp

@@ -224,6 +224,10 @@ void CRenderWareSA::PulseWorldTextureWatch()
 ////////////////////////////////////////////////////////////////
 void CRenderWareSA::StreamingAddedTexture(ushort usTxdId, const SString& strTextureName, CD3DDUMMY* pD3DData)
 {
+    // Skip textures without valid D3D data or name - shader matching requires both
+    if (!pD3DData || strTextureName.empty())
+        return;
+
     STexInfo* pTexInfo = CreateTexInfo(usTxdId, strTextureName, pD3DData);
     OnTextureStreamIn(pTexInfo);
 }
@@ -258,6 +262,50 @@ void CRenderWareSA::StreamingRemovedTxd(ushort usTxdId)
     TIMING_CHECKPOINT("-StreamingRemovedTxd");
 }
 
+////////////////////////////////////////////////////////////////
+//
+// CRenderWareSA::RemoveStreamingTexture
+//
+// Remove a single texture that was added via StreamingAddedTexture.
+// Finds the texture by matching TXD ID and D3D data pointer.
+//
+////////////////////////////////////////////////////////////////
+void CRenderWareSA::RemoveStreamingTexture(unsigned short usTxdId, CD3DDUMMY* pD3DData)
+{
+    if (!pD3DData)
+        return;
+
+    typedef std::multimap<ushort, STexInfo*>::iterator IterType;
+    std::pair<IterType, IterType> range = m_TexInfoMap.equal_range(usTxdId);
+    for (IterType iter = range.first; iter != range.second;)
+    {
+        STexInfo* pTexInfo = iter->second;
+        if (pTexInfo && pTexInfo->pD3DData == pD3DData)
+        {
+            OnTextureStreamOut(pTexInfo);
+            DestroyTexInfo(pTexInfo);
+            m_TexInfoMap.erase(iter++);
+            return;  // Only one entry per D3D data
+        }
+        else
+            ++iter;
+    }
+}
+
+////////////////////////////////////////////////////////////////
+//
+// CRenderWareSA::IsTexInfoRegistered
+//
+// Check if a D3D data pointer is already registered in the shader system.
+//
+////////////////////////////////////////////////////////////////
+bool CRenderWareSA::IsTexInfoRegistered(CD3DDUMMY* pD3DData) const
+{
+    if (!pD3DData)
+        return false;
+    return MapContains(m_D3DDataTexInfoMap, pD3DData);
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // CRenderWareSA::ScriptAddedTxd
@@ -269,13 +317,28 @@ void CRenderWareSA::StreamingRemovedTxd(ushort usTxdId)
 void CRenderWareSA::ScriptAddedTxd(RwTexDictionary* pTxd)
 {
     TIMING_CHECKPOINT("+ScriptAddedTxd");
+
+    // Validate TXD pointer before iterating
+    if (!pTxd || !SharedUtil::IsReadablePointer(pTxd, sizeof(RwTexDictionary)))
+    {
+        TIMING_CHECKPOINT("-ScriptAddedTxd");
+        return;
+    }
+
     std::vector<RwTexture*> textureList;
     GetTxdTextures(textureList, pTxd);
     for (std::vector<RwTexture*>::iterator iter = textureList.begin(); iter != textureList.end(); iter++)
     {
         RwTexture*  texture = *iter;
+        if (!texture || !SharedUtil::IsReadablePointer(texture, sizeof(RwTexture)))
+            continue;
+
         const char* szTextureName = texture->name;
-        CD3DDUMMY*  pD3DData = texture->raster ? (CD3DDUMMY*)texture->raster->renderResource : NULL;
+        CD3DDUMMY*  pD3DData = (texture->raster && SharedUtil::IsReadablePointer(texture->raster, sizeof(RwRaster)))
+            ? (CD3DDUMMY*)texture->raster->renderResource : NULL;
+
+        if (!pD3DData || !szTextureName[0])
+            continue;
 
         // Added texture
         STexInfo* pTexInfo = CreateTexInfo(texture, szTextureName, pD3DData);
@@ -320,12 +383,21 @@ void CRenderWareSA::ScriptRemovedTexture(RwTexture* pTex)
 ////////////////////////////////////////////////////////////////
 void CRenderWareSA::SpecialAddedTexture(RwTexture* texture, const char* szTextureName)
 {
+    if (!texture || !SharedUtil::IsReadablePointer(texture, sizeof(RwTexture)))
+        return;
+
     if (!szTextureName)
         szTextureName = texture->name;
+    if (!szTextureName || !szTextureName[0])
+        return;
 
-    OutputDebug(SString("Adding special texture %s", szTextureName));
+    CD3DDUMMY* pD3DData = (texture->raster && SharedUtil::IsReadablePointer(texture->raster, sizeof(RwRaster)))
+        ? (CD3DDUMMY*)texture->raster->renderResource : NULL;
 
-    CD3DDUMMY* pD3DData = texture->raster ? (CD3DDUMMY*)texture->raster->renderResource : NULL;
+    if (!pD3DData)
+        return;
+
+    OutputDebug(SString("Adding special texture %s", szTextureName));
 
     // Added texture
     STexInfo* pTexInfo = CreateTexInfo(texture, szTextureName, pD3DData);