diff --git a/Core/Config.cpp b/Core/Config.cpp index da0b1aa0d1..cce0b9d7cb 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -877,7 +877,6 @@ static const ConfigSetting graphicsSettings[] = { ReportedConfigSetting("ReplaceTextures", &g_Config.bReplaceTextures, true, true, true), ReportedConfigSetting("SaveNewTextures", &g_Config.bSaveNewTextures, false, true, true), ConfigSetting("IgnoreTextureFilenames", &g_Config.bIgnoreTextureFilenames, false, true, true), - ConfigSetting("ReplaceTexturesAllowLate", &g_Config.bReplaceTexturesAllowLate, true, true, true), ReportedConfigSetting("TexScalingLevel", &g_Config.iTexScalingLevel, 1, true, true), ReportedConfigSetting("TexScalingType", &g_Config.iTexScalingType, 0, true, true), diff --git a/Core/Config.h b/Core/Config.h index f5f902c5f1..38f90902a0 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -213,7 +213,6 @@ public: bool bReplaceTextures; bool bSaveNewTextures; bool bIgnoreTextureFilenames; - bool bReplaceTexturesAllowLate; int iTexScalingLevel; // 0 = auto, 1 = off, 2 = 2x, ..., 5 = 5x int iTexScalingType; // 0 = xBRZ, 1 = Hybrid bool bTexDeposterize; diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index 98de573b2f..2ac2e23133 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -494,7 +494,7 @@ ReplacedTexture *TextureReplacer::FindReplacement(u64 cachekey, u32 hash, int w, ReplacedTexture *result = new ReplacedTexture(); cache_[replacementKey] = result; result->vfs_ = this->vfs_; - if (!g_Config.bReplaceTexturesAllowLate || budget > 0.0) { + if (budget > 0.0) { PopulateReplacement(result, cachekey, hash, w, h); } return result; @@ -998,20 +998,13 @@ bool ReplacedTexture::IsReady(double budget) { if (!prepareDone_) return false; - if (g_Config.bReplaceTexturesAllowLate) { - if (threadWaitable_) - delete threadWaitable_; - threadWaitable_ = new LimitedWaitable(); - g_threadManager.EnqueueTask(new ReplacedTextureTask(vfs_, *this, threadWaitable_)); - - if (threadWaitable_->WaitFor(budget)) { - // If we finished all the levels, we're done. - return initDone_ && levelData_ != nullptr && !levelData_->data.empty(); - } - } else { - Prepare(vfs_); - _assert_(initDone_); - return true; + if (threadWaitable_) + delete threadWaitable_; + threadWaitable_ = new LimitedWaitable(); + g_threadManager.EnqueueTask(new ReplacedTextureTask(vfs_, *this, threadWaitable_)); + if (threadWaitable_->WaitFor(budget)) { + // If we finished all the levels, we're done. + return initDone_ && levelData_ != nullptr && !levelData_->data.empty(); } // Still pending on thread.