From 8ad3f975b2a4470345390303e0a386c2d9688f3b Mon Sep 17 00:00:00 2001 From: xbzk Date: Tue, 26 May 2026 11:09:55 -0300 Subject: [PATCH] [settings] disabled per-game gpu log settings to fix dump shader bug --- .../settings/ui/SettingsFragmentPresenter.kt | 18 ++++++++++-------- src/common/settings.cpp | 1 - src/common/settings.h | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index 161579927c..fee953aa14 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -1287,14 +1287,16 @@ class SettingsFragmentPresenter( add(ShortSetting.DEBUG_KNOBS.key) - add(HeaderSetting(R.string.gpu_logging_header)) - add(BooleanSetting.GPU_LOGGING_ENABLED.key) - add(ByteSetting.GPU_LOG_LEVEL.key) - add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key) - add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key) - add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key) - add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key) - add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key) + if (!NativeConfig.isPerGameConfigLoaded()) { + add(HeaderSetting(R.string.gpu_logging_header)) + add(BooleanSetting.GPU_LOGGING_ENABLED.key) + add(ByteSetting.GPU_LOG_LEVEL.key) + add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key) + add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key) + add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key) + add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key) + add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key) + } } } diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 61f9acb1e7..5cb2d71dc5 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -54,7 +54,6 @@ SWITCHABLE(CpuBackend, true); SWITCHABLE(CpuAccuracy, true); SWITCHABLE(FullscreenMode, true); SWITCHABLE(GpuAccuracy, true); -SWITCHABLE(GpuLogLevel, true); SWITCHABLE(Language, true); SWITCHABLE(MemoryLayout, true); SWITCHABLE(NvdecEmulation, false); diff --git a/src/common/settings.h b/src/common/settings.h index f38e95d5a4..800301a93c 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -808,8 +808,8 @@ struct Values { // GPU Logging Setting gpu_logging_enabled{linkage, false, "gpu_logging_enabled", Category::Debugging}; - SwitchableSetting gpu_log_level{linkage, GpuLogLevel::Standard, "gpu_log_level", - Category::Debugging}; + Setting gpu_log_level{linkage, GpuLogLevel::Standard, "gpu_log_level", + Category::Debugging}; Setting gpu_log_vulkan_calls{linkage, true, "gpu_log_vulkan_calls", Category::Debugging}; Setting gpu_log_shader_dumps{linkage, false, "gpu_log_shader_dumps", Category::Debugging}; Setting gpu_log_memory_tracking{linkage, true, "gpu_log_memory_tracking",