Skip to content

Fix three leaks in the world texture watch #5301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flashmyname wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix three leaks in the world texture watch #5301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c6ed9e
Fix pending TXD 'removed' events being swallowed by a later 'added'
Flashmyname Sep 1, 2026
1940d6e
Fix HOOK_CTxdStore_RemoveTxd reading the txd id from the wrong place
Flashmyname Sep 1, 2026
27c7e07
Reclaim STexNameInfo entries once nothing refers to them
Flashmyname Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Client/game_sa/CRenderWareSA.ShaderMatching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,25 @@ void CMatchChannelManager::RemoveTexture(STexInfo* pTexInfo)
dassert(MapContains(pTexNameInfo->usedByTexInfoList, pTexInfo));
MapRemove(pTexNameInfo->usedByTexInfoList, pTexInfo);
pTexInfo->pAssociatedTexNameInfo = NULL;

MaybeDeleteTexNameInfo(pTexNameInfo);
}

//////////////////////////////////////////////////////////////////
//
// CMatchChannelManager::MaybeDeleteTexNameInfo
//
// Both lists together are every reference that can exist: the texinfos
// pointing back at it, and the channels holding it in m_MatchedTextureList.
//
//////////////////////////////////////////////////////////////////
void CMatchChannelManager::MaybeDeleteTexNameInfo(STexNameInfo* pTexNameInfo)
{
if (pTexNameInfo->usedByTexInfoList.empty() && pTexNameInfo->matchChannelList.empty())
{
MapRemove(m_AllTextureList, pTexNameInfo->strTextureName);
delete pTexNameInfo;
}
}

//////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -614,6 +633,7 @@ void CMatchChannelManager::ProcessRematchTexturesQueue()
pChannel->RemoveTexture(pTexNameInfo);
MapRemove(pTexNameInfo->matchChannelList, pChannel);
pTexNameInfo->ResetReplacementResults(); // Do this here as it won't get picked up in RecalcEverything now
MaybeDeleteTexNameInfo(pTexNameInfo);
}

// Rematch against texture list
Expand Down Expand Up @@ -822,6 +842,7 @@ void CMatchChannelManager::DeleteChannel(CMatchChannel* pChannel)

// Reset shader matches now as this channel is going
pTexNameInfo->ResetReplacementResults();
MaybeDeleteTexNameInfo(pTexNameInfo);
}

#ifdef SHADER_DEBUG_CHECKS
Expand Down
1 change: 1 addition & 0 deletions Client/game_sa/CRenderWareSA.ShaderMatching.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ class CMatchChannelManager

STexShaderReplacement* UpdateTexShaderReplacement(STexNameInfo* pTexNameInfo, CClientEntityBase* pClientEntity, int iEntityType);
void UpdateTexShaderReplacementNoEntity(STexNameInfo* pTexNameInfo, STexShaderReplacement& texNoEntityShader, int iEntityType);
void MaybeDeleteTexNameInfo(STexNameInfo* pTexNameInfo);
void FinalizeLayers(SShaderInfoLayers& shaderLayers);

bool m_bChangesPending;
Expand Down
9 changes: 4 additions & 5 deletions Client/game_sa/CRenderWareSA.ShaderSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ static CMappedArray<STxdStreamEvent> ms_txdStreamEventList;
__declspec(noinline) void _cdecl OnStreamingAddedTxd(DWORD dwTxdId)
{
ushort usTxdId = (ushort)dwTxdId;
// Ensure there are no previous events for this txd
ms_txdStreamEventList.remove(STxdStreamEvent(false, usTxdId));
// Drop a duplicate 'added' only - a pending 'removed' still has to reach the watch
ms_txdStreamEventList.remove(STxdStreamEvent(true, usTxdId));
// Append 'added'
ms_txdStreamEventList.push_back(STxdStreamEvent(true, usTxdId));
Expand Down Expand Up @@ -113,7 +112,7 @@ static void __declspec(naked) HOOK_CTxdStore_SetupTxdParent()
////////////////////////////////////////////////////////////////
__declspec(noinline) void _cdecl OnStreamingRemoveTxd(DWORD dwTxdId)
{
ushort usTxdId = (ushort)dwTxdId - pGame->GetBaseIDforTXD();
ushort usTxdId = (ushort)dwTxdId;
// Ensure there are no previous events for this txd
ms_txdStreamEventList.remove(STxdStreamEvent(true, usTxdId));
ms_txdStreamEventList.remove(STxdStreamEvent(false, usTxdId));
Expand All @@ -131,9 +130,9 @@ static void __declspec(naked) HOOK_CTxdStore_RemoveTxd()
{
// Hooked from 731E90 6 bytes

// esi - txd id + 20000
// __cdecl txd id - esi still holds the caller's value at this address
pushad
push esi
push [esp+32+4*1]
call OnStreamingRemoveTxd
add esp, 4
popad
Expand Down
Loading