Merge pull request #4933 from Armada651/disable-cache

VideoBackends: Add a developer option to disable the shader cache.

1 files changed, 11 insertions, 8 deletions

diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
index da42031a7a..a1090fa2f2 100644
--- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
@@ -494,17 +494,20 @@ void PixelShaderCache::Init()
 
   Clear();
 
-  if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
-    File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
-
   SETSTAT(stats.numPixelShadersCreated, 0);
   SETSTAT(stats.numPixelShadersAlive, 0);
 
-  std::string cache_filename =
-      StringFromFormat("%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
-                       SConfig::GetInstance().m_strGameID.c_str());
-  PixelShaderCacheInserter inserter;
-  g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
+  if (g_ActiveConfig.bShaderCache)
+  {
+    if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
+      File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
+
+    std::string cache_filename =
+        StringFromFormat("%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+                         SConfig::GetInstance().m_strGameID.c_str());
+    PixelShaderCacheInserter inserter;
+    g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
+  }
 
   last_entry = nullptr;
 }