From dafc914bcc2b5cc435ac0fdb5f4ddc5e2fa758f8 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Thu, 20 Sep 2018 17:07:34 +0300 Subject: [PATCH] rsx: temporary hack - Removes all use of valid_count as a metric until the new refactor is merged --- rpcs3/Emu/RSX/Common/texture_cache.h | 10 +++++----- rpcs3/Emu/RSX/GL/GLTextureCache.h | 4 ++-- rpcs3/Emu/RSX/VK/VKTextureCache.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index ced3d8d3fb..86032973ab 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -290,7 +290,7 @@ namespace rsx void notify(u32 addr, u32 data_size) { - verify(HERE), valid_count >= 0; + //verify(HERE), valid_count >= 0; const u32 addr_base = addr & ~0xfff; const u32 block_sz = align(addr + data_size, 4096u) - addr_base; @@ -303,7 +303,7 @@ namespace rsx void notify() { - verify(HERE), valid_count >= 0; + //verify(HERE), valid_count >= 0; valid_count++; } @@ -315,7 +315,7 @@ namespace rsx void remove_one() { - verify(HERE), valid_count > 0; + //verify(HERE), valid_count > 0; valid_count--; } @@ -1510,8 +1510,8 @@ namespace rsx { auto &range_data = address_range.second; - if (range_data.valid_count == 0) - empty_addresses.push_back(address_range.first); + //if (range_data.valid_count == 0) + //empty_addresses.push_back(address_range.first); for (auto &tex : range_data.data) { diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index df5dff0f72..256ee0101e 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -1107,8 +1107,8 @@ namespace gl if (found == m_cache.end()) return false; - if (found->second.valid_count == 0) - return false; + //if (found->second.valid_count == 0) + //return false; for (auto& tex : found->second.data) { diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 382db74bcf..36b65bf668 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -985,8 +985,8 @@ namespace vk if (found == m_cache.end()) return false; - if (found->second.valid_count == 0) - return false; + //if (found->second.valid_count == 0) + //return false; for (auto& tex : found->second.data) {