diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp index 878f54eccd..2d05fbae76 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp @@ -6956,7 +6956,7 @@ GSTextureCache::HashCacheEntry* GSTextureCache::LookupHashCache(const GIFRegTEX0 return &m_hash_cache.emplace(key, entry).first->second; } -void GSTextureCache::RemoveFromHashCache(HashCacheMap::iterator it) +GSTextureCache::HashCacheMap::iterator GSTextureCache::RemoveFromHashCache(HashCacheMap::iterator it) { HashCacheEntry& e = it->second; const u32 mem_usage = e.texture->GetMemUsage(); @@ -6965,7 +6965,7 @@ void GSTextureCache::RemoveFromHashCache(HashCacheMap::iterator it) else m_hash_cache_memory_usage -= mem_usage; g_gs_device->Recycle(e.texture); - m_hash_cache.erase(it); + return m_hash_cache.erase(it); } void GSTextureCache::AgeHashCache() @@ -6992,7 +6992,7 @@ void GSTextureCache::AgeHashCache() if (++e.age > MAX_HASH_CACHE_AGE) { - RemoveFromHashCache(it++); + it = RemoveFromHashCache(it); continue; } diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.h b/pcsx2/GS/Renderers/HW/GSTextureCache.h index 323b2294f6..caebc218f0 100644 --- a/pcsx2/GS/Renderers/HW/GSTextureCache.h +++ b/pcsx2/GS/Renderers/HW/GSTextureCache.h @@ -471,7 +471,7 @@ protected: bool PrepareDownloadTexture(u32 width, u32 height, GSTexture::Format format, std::unique_ptr* tex); HashCacheEntry* LookupHashCache(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, bool& paltex, const u32* clut, const GSVector2i* lod, SourceRegion region); - void RemoveFromHashCache(HashCacheMap::iterator it); + HashCacheMap::iterator RemoveFromHashCache(HashCacheMap::iterator it); void AgeHashCache(); static void PreloadTexture(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, SourceRegion region, GSLocalMemory& mem, bool paltex, GSTexture* tex, u32 level, std::pair* alpha_minmax);