ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/HW: Don't consider custom textures in hash cache overflow 

Prevents hash cache from being disabled due to a large number of custom
textures. The VRAM usage from the custom textures will still be shown in
the OSD.
This commit is contained in:
Connor McLaughlin 2022-12-06 19:47:42 +10:00 committed by refractionpcsx2
parent f2030d9957
commit 898055a3c2
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/GS.cpp
View File

@ -700,7 +700,7 @@ void GSgetStats(std::string& info)
{
info = StringUtil::StdStringFromFormat("%s HW | HC: %d MB | %d P | %d D | %d DC | %d B | %d RB | %d TC | %d TU",
api_name,
(int)std::ceil(GSRendererHW::GetInstance()->GetTextureCache()->GetHashCacheMemoryUsage() / 1048576.0f),
(int)std::ceil(GSRendererHW::GetInstance()->GetTextureCache()->GetTotalHashCacheMemoryUsage() / 1048576.0f),
(int)pm.Get(GSPerfMon::Prim),
(int)pm.Get(GSPerfMon::Draw),
(int)std::ceil(pm.Get(GSPerfMon::DrawCalls)),

18
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -76,6 +76,7 @@ void GSTextureCache::RemoveAll()
g_gs_device->Recycle(it.second.texture);
m_hash_cache.clear();
m_hash_cache_memory_usage = 0;
m_hash_cache_replacement_memory_usage = 0;
m_palette_map.Clear();
m_target_heights.clear();
@ -1639,7 +1640,11 @@ void GSTextureCache::IncAge()
HashCacheEntry& e = it->second;
if (e.refcount == 0 && ++e.age > max_hash_cache_age)
{
m_hash_cache_memory_usage -= e.texture->GetMemUsage();
const u32 mem_usage = e.texture->GetMemUsage();
if (e.is_replacement)
m_hash_cache_replacement_memory_usage -= mem_usage;
else
m_hash_cache_memory_usage -= mem_usage;
g_gs_device->Recycle(e.texture);
m_hash_cache.erase(it++);
}
@ -2122,7 +2127,7 @@ GSTextureCache::HashCacheEntry* GSTextureCache::LookupHashCache(const GIFRegTEX0
// found a replacement texture! insert it into the hash cache, and clear paltex (since it's not indexed)
paltex = false;
const HashCacheEntry entry{replacement_tex, 1u, 0u, true};
m_hash_cache_memory_usage += entry.texture->GetMemUsage();
m_hash_cache_replacement_memory_usage += entry.texture->GetMemUsage();
return &m_hash_cache.emplace(key, entry).first->second;
}
else if (
@ -3158,7 +3163,7 @@ void GSTextureCache::InvalidateTemporarySource()
void GSTextureCache::InjectHashCacheTexture(const HashCacheKey& key, GSTexture* tex)
{
// When we insert we update memory usage. Old texture gets removed below.
m_hash_cache_memory_usage += tex->GetMemUsage();
m_hash_cache_replacement_memory_usage += tex->GetMemUsage();
auto it = m_hash_cache.find(key);
if (it == m_hash_cache.end())
@ -3175,10 +3180,11 @@ void GSTextureCache::InjectHashCacheTexture(const HashCacheKey& key, GSTexture*
// Update memory usage, swap the textures, and recycle the old one for reuse.
if (!it->second.is_replacement)
{
m_hash_cache_memory_usage -= it->second.texture->GetMemUsage();
it->second.is_replacement = true;
}
else
m_hash_cache_replacement_memory_usage -= it->second.texture->GetMemUsage();
it->second.is_replacement = true;
it->second.texture->Swap(tex);
g_gs_device->Recycle(tex);
}

3
pcsx2/GS/Renderers/HW/GSTextureCache.h
View File

@ -300,6 +300,7 @@ protected:
SourceMap m_src;
std::unordered_map<HashCacheKey, HashCacheEntry, HashCacheKeyHash> m_hash_cache;
u64 m_hash_cache_memory_usage = 0;
u64 m_hash_cache_replacement_memory_usage;
FastList<Target*> m_dst[2];
FastList<TargetHeightElem> m_target_heights;
static u8* m_temp;
@ -327,6 +328,8 @@ public:
~GSTextureCache();
__fi u64 GetHashCacheMemoryUsage() const { return m_hash_cache_memory_usage; }
__fi u64 GetHashCacheReplacementMemoryUsage() const { return m_hash_cache_replacement_memory_usage; }
__fi u64 GetTotalHashCacheMemoryUsage() const { return (m_hash_cache_memory_usage + m_hash_cache_replacement_memory_usage); }
void Read(Target* t, const GSVector4i& r);
void Read(Source* t, const GSVector4i& r);