From 7cab540fcafef4d56900a652d86d7bfbd415778b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 8 Mar 2022 19:46:27 +0100 Subject: [PATCH] Short circuit the texture replacement code --- GPU/Common/TextureCacheCommon.cpp | 7 +++++++ GPU/Vulkan/TextureCacheVulkan.cpp | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 076899015d..7397b22c96 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -1277,6 +1277,13 @@ u32 TextureCacheCommon::EstimateTexMemoryUsage(const TexCacheEntry *entry) { } ReplacedTexture &TextureCacheCommon::FindReplacement(TexCacheEntry *entry, int &w, int &h) { + // Short circuit the non-enabled case. + // Otherwise, due to bReplaceTexturesAllowLate, we'll still spawn tasks looking for replacements + // that then won't be used. + if (!replacer_.Enabled()) { + return replacer_.FindNone(); + } + // Allow some delay to reduce pop-in. constexpr double MAX_BUDGET_PER_TEX = 0.25 / 60.0; diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index de04a1b460..d8369eb2ba 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -657,7 +657,6 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) { badMipSizes = false; } - // Don't scale the PPGe texture. if (entry->addr > 0x05000000 && entry->addr < PSP_GetKernelMemoryEnd()) { scaleFactor = 1;