From 3e08c3c4397388841220ebdd617f105bcaa81114 Mon Sep 17 00:00:00 2001 From: xbzk Date: Tue, 26 May 2026 17:51:07 -0300 Subject: [PATCH] [settings] rename of dump_shaders setting into dump_guest_shaders for desambiguation --- src/common/settings.h | 4 ++-- src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 ++-- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 4 ++-- src/yuzu/configuration/configure_debug.cpp | 6 +++--- src/yuzu/configuration/configure_debug.ui | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 2d115f6fec..75214a1064 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -782,8 +782,8 @@ struct Values { Setting program_args{linkage, std::string(), "program_args", Category::Debugging}; Setting dump_exefs{linkage, false, "dump_exefs", Category::Debugging}; Setting dump_nso{linkage, false, "dump_nso", Category::Debugging}; - Setting dump_shaders{ - linkage, false, "dump_shaders", Category::DebuggingGraphics, Specialization::Default, + Setting dump_guest_shaders{ + linkage, false, "dump_guest_shaders", Category::DebuggingGraphics, Specialization::Default, false}; Setting dump_macros{ linkage, false, "dump_macros", Category::DebuggingGraphics, Specialization::Default, false}; diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index deedf1aa6b..99e9df9e0b 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -477,7 +477,7 @@ std::unique_ptr ShaderCache::CreateGraphicsPipeline( const u32 cfg_offset = u32(env.StartAddress() + sizeof(Shader::ProgramHeader)); Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset, index == 0); - if (Settings::values.dump_shaders) { + if (Settings::values.dump_guest_shaders) { env.Dump(hash, key.unique_hashes[index]); } @@ -574,7 +574,7 @@ std::unique_ptr ShaderCache::CreateComputePipeline( Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()}; - if (Settings::values.dump_shaders) { + if (Settings::values.dump_guest_shaders) { env.Dump(hash, key.unique_hash); } diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 12dcfb0cb7..6ca553f010 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -752,7 +752,7 @@ std::unique_ptr PipelineCache::CreateGraphicsPipeline( programs[index] = MergeDualVertexPrograms(program_va, program_vb, env); } - if (Settings::values.dump_shaders) { + if (Settings::values.dump_guest_shaders) { env.Dump(hash, key.unique_hashes[index]); } @@ -887,7 +887,7 @@ std::unique_ptr PipelineCache::CreateComputePipeline( Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()}; // Dump it before error. - if (Settings::values.dump_shaders) { + if (Settings::values.dump_guest_shaders) { env.Dump(hash, key.unique_hash); } diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index c7ca85ce99..55620d5264 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -79,8 +79,8 @@ void ConfigureDebug::SetConfiguration() { ui->enable_shader_feedback->setChecked(Settings::values.renderer_shader_feedback.GetValue()); ui->enable_nsight_aftermath->setEnabled(runtime_lock); ui->enable_nsight_aftermath->setChecked(Settings::values.enable_nsight_aftermath.GetValue()); - ui->dump_shaders->setEnabled(runtime_lock); - ui->dump_shaders->setChecked(Settings::values.dump_shaders.GetValue()); + ui->dump_guest_shaders->setEnabled(runtime_lock); + ui->dump_guest_shaders->setChecked(Settings::values.dump_guest_shaders.GetValue()); ui->dump_macros->setEnabled(runtime_lock); ui->dump_macros->setChecked(Settings::values.dump_macros.GetValue()); ui->disable_macro_jit->setEnabled(runtime_lock); @@ -121,7 +121,7 @@ void ConfigureDebug::ApplyConfiguration() { Settings::values.disable_buffer_reorder = ui->disable_buffer_reorder->isChecked(); Settings::values.renderer_shader_feedback = ui->enable_shader_feedback->isChecked(); Settings::values.enable_nsight_aftermath = ui->enable_nsight_aftermath->isChecked(); - Settings::values.dump_shaders = ui->dump_shaders->isChecked(); + Settings::values.dump_guest_shaders = ui->dump_guest_shaders->isChecked(); Settings::values.dump_macros = ui->dump_macros->isChecked(); Settings::values.disable_shader_loop_safety_checks = ui->disable_loop_safety_checks->isChecked(); diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index f76f3b012d..bd97101f8d 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui @@ -294,15 +294,15 @@ - + true - When checked, it will dump all the original assembler shaders from the disk shader cache or game as found + When checked, it will dump original Maxwell guest shader bytecode (the input to the recompiler) as .ash files under DumpDir/shaders/. Useful for inspection with nvdisasm. - Dump Game Shaders + Dump Guest (Maxwell) Shaders