Skip shaders from config

Author: Xcedf

src/common/config.cpp

@@ -78,6 +78,7 @@ static int controllerCustomColorRGB[3] = {0, 0, 255};
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
 static std::string trophyKey;
+std::vector<u64> skipedHashes = {};
 
 // Gui
 static bool load_game_size = true;
@@ -434,6 +435,10 @@ static void setShowLabelsUnderIcons(bool enable) {
     showLabelsUnderIcons = enable;
 }
 
+std::vector<u64> hashesToSkip() {
+    return skipedHashes;
+}
+
 void setFullscreenMode(std::string mode) {
     fullscreenMode = mode;
 }
@@ -803,6 +808,7 @@ void load(const std::filesystem::path& path) {
         isFullscreen = toml::find_or<bool>(gpu, "Fullscreen", false);
         fullscreenMode = toml::find_or<std::string>(gpu, "FullscreenMode", "Windowed");
         isHDRAllowed = toml::find_or<bool>(gpu, "allowHDR", false);
+        skipedHashes = toml::find_or<std::vector<u64>>(gpu, "skipShaders", {});
     }
 
     if (data.contains("Vulkan")) {
@@ -986,6 +992,7 @@ void save(const std::filesystem::path& path) {
     data["GPU"]["Fullscreen"] = isFullscreen;
     data["GPU"]["FullscreenMode"] = fullscreenMode;
     data["GPU"]["allowHDR"] = isHDRAllowed;
+    data["GPU"]["skipShaders"] = skipedHashes;
     data["Vulkan"]["gpuId"] = gpuId;
     data["Vulkan"]["validation"] = vkValidation;
     data["Vulkan"]["validation_sync"] = vkValidationSync;

src/common/config.h

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

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -266,6 +266,16 @@ const ComputePipeline* PipelineCache::GetComputePipeline() {
     return it->second.get();
 }
 
+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));
 
@@ -379,6 +389,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_,
@@ -487,6 +501,9 @@ bool PipelineCache::RefreshComputeKey() {
     Shader::Backend::Bindings binding{};
     const auto& cs_pgm = liverpool->GetCsRegs();
     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.value) =
         GetProgram(Shader::Stage::Compute, LogicalStage::Compute, cs_params, binding);
     return true;