Skip shaders from config

Author: Xcedf

src/common/config.cpp

@@ -64,6 +64,7 @@ static bool vkCrashDiagnostic = false;
 static s16 cursorState = HideCursorState::Idle;
 static int cursorHideTimeout = 5; // 5 seconds (default)
 static bool separateupdatefolder = false;
+std::vector<u64> skipedHashes = {};
 
 // Gui
 std::vector<std::filesystem::path> settings_install_dirs = {};
@@ -280,6 +281,10 @@ void setVblankDiv(u32 value) {
     vblankDivider = value;
 }
 
+std::vector<u64> hashesToSkip() {
+    return skipedHashes;
+}
+
 void setFullscreenMode(bool enable) {
     isFullscreen = enable;
 }
@@ -562,6 +567,7 @@ void load(const std::filesystem::path& path) {
         shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
         shouldPatchShaders = toml::find_or<bool>(gpu, "patchShaders", true);
         vblankDivider = toml::find_or<int>(gpu, "vblankDivider", 1);
+        skipedHashes = toml::find_or<std::vector<u64>>(gpu, "skipShaders", {});
     }
 
     if (data.contains("Vulkan")) {
@@ -664,6 +670,7 @@ void save(const std::filesystem::path& path) {
     data["GPU"]["dumpShaders"] = shouldDumpShaders;
     data["GPU"]["patchShaders"] = shouldPatchShaders;
     data["GPU"]["vblankDivider"] = vblankDivider;
+    data["GPU"]["skipShaders"] = skipedHashes;
     data["Vulkan"]["gpuId"] = gpuId;
     data["Vulkan"]["validation"] = vkValidation;
     data["Vulkan"]["validation_sync"] = vkValidationSync;

src/common/config.h

@@ -46,6 +46,7 @@ bool dumpShaders();
 bool patchShaders();
 bool isRdocEnabled();
 u32 vblankDiv();
+std::vector<u64> hashesToSkip();
 
 void setDebugDump(bool enable);
 void setCollectShaderForDebug(bool enable);

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -207,6 +207,16 @@ const ComputePipeline* PipelineCache::GetComputePipeline() {
     return it->second;
 }
 
+bool ShouldSkipShader(u64 shader_hash, const char* shader_type) {
+    std::vector<u64> skip_hashes = Config::hashesToSkip();
+    shader_hash = shader_hash & INT64_MAX;
+    if (std::ranges::contains(skip_hashes, shader_hash)) {
+        //LOG_WARNING(Render_Vulkan, "Skipped {} shader hash {:#x}.", shader_type, shader_hash);
+        return true;
+    }
+    return false;
+}
+
 bool PipelineCache::RefreshGraphicsKey() {
     std::memset(&graphics_key, 0, sizeof(GraphicsPipelineKey));
 
@@ -308,6 +318,10 @@ bool PipelineCache::RefreshGraphicsKey() {
             return false;
         }
 
+        if (ShouldSkipShader(bininfo.shader_hash, "graphics")) {
+            return false;
+        }
+
         auto params = Liverpool::GetParams(*pgm);
         std::optional<Shader::Gcn::FetchShaderData> fetch_shader_;
         std::tie(infos[stage_out_idx], modules[stage_out_idx], fetch_shader_,
@@ -401,6 +415,9 @@ bool PipelineCache::RefreshComputeKey() {
     Shader::Backend::Bindings binding{};
     const auto* cs_pgm = &liverpool->regs.cs_program;
     const auto cs_params = Liverpool::GetParams(*cs_pgm);
+    if (ShouldSkipShader(cs_params.hash, "compute")) {
+        return false;
+    }
     std::tie(infos[0], modules[0], fetch_shader, compute_key) =
         GetProgram(Shader::Stage::Compute, cs_params, binding);
     return true;