From 65054c33e9af9780119d7b2237ab418f656e6c2d Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 24 Nov 2025 07:09:13 +0000 Subject: [PATCH] [vk] remove redundant "enable" of sample shading --- .../features/settings/model/BooleanSetting.kt | 1 - .../features/settings/model/view/SettingsItem.kt | 7 ------- src/common/settings.h | 12 +----------- src/qt_common/config/shared_translation.cpp | 2 -- .../renderer_vulkan/vk_graphics_pipeline.cpp | 4 ++-- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt index 475d9192c6..6676313e57 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt @@ -31,7 +31,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting { RENDERER_VERTEX_INPUT_DYNAMIC_STATE("vertex_input_dynamic_state"), RENDERER_PROVOKING_VERTEX("provoking_vertex"), RENDERER_DESCRIPTOR_INDEXING("descriptor_indexing"), - RENDERER_SAMPLE_SHADING("sample_shading"), PICTURE_IN_PICTURE("picture_in_picture"), USE_CUSTOM_RTC("custom_rtc_enabled"), BLACK_BACKGROUNDS("black_backgrounds"), diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt index 62929bf371..38c30bf129 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt @@ -160,13 +160,6 @@ abstract class SettingsItem( descriptionId = R.string.descriptor_indexing_description ) ) - put( - SwitchSetting( - BooleanSetting.RENDERER_SAMPLE_SHADING, - titleId = R.string.sample_shading, - descriptionId = R.string.sample_shading_description - ) - ) put( SliderSetting( IntSetting.RENDERER_SAMPLE_SHADING_FRACTION, diff --git a/src/common/settings.h b/src/common/settings.h index 4a8d352c5f..166790b06b 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -535,17 +535,7 @@ struct Values { SwitchableSetting vertex_input_dynamic_state{linkage, true, "vertex_input_dynamic_state", Category::RendererExtensions}; SwitchableSetting provoking_vertex{linkage, false, "provoking_vertex", Category::RendererExtensions}; SwitchableSetting descriptor_indexing{linkage, false, "descriptor_indexing", Category::RendererExtensions}; - SwitchableSetting sample_shading{linkage, false, "sample_shading", Category::RendererExtensions, Specialization::Paired}; - SwitchableSetting sample_shading_fraction{linkage, - 50, - 0, - 100, - "sample_shading_fraction", - Category::RendererExtensions, - Specialization::Scalar, - true, - false, - &sample_shading}; + SwitchableSetting sample_shading_fraction{linkage, 0, 0, 100, "sample_shading_fraction", Category::RendererExtensions, Specialization::Scalar, true}; Setting renderer_debug{linkage, false, "debug", Category::RendererDebug}; Setting renderer_shader_feedback{linkage, false, "shader_feedback", diff --git a/src/qt_common/config/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp index 6609c3e357..d16fc0eae8 100644 --- a/src/qt_common/config/shared_translation.cpp +++ b/src/qt_common/config/shared_translation.cpp @@ -346,8 +346,6 @@ std::unique_ptr InitializeTranslations(QObject* parent) tr("Improves texture & buffer handling and the Maxwell translation layer.\n" "Some Vulkan 1.1+ and all 1.2+ devices support this extension.")); - INSERT(Settings, sample_shading, QString(), QString()); - INSERT(Settings, sample_shading_fraction, tr("Sample Shading"), diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 94916417b6..dc738a5051 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -744,8 +744,8 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { .pNext = nullptr, .flags = 0, .rasterizationSamples = MaxwellToVK::MsaaMode(key.state.msaa_mode), - .sampleShadingEnable = Settings::values.sample_shading.GetValue() ? VK_TRUE : VK_FALSE, - .minSampleShading = static_cast(Settings::values.sample_shading_fraction.GetValue()) / 100.0f, + .sampleShadingEnable = Settings::values.sample_shading_fraction.GetValue() > 0 ? VK_TRUE : VK_FALSE, + .minSampleShading = float(Settings::values.sample_shading_fraction.GetValue()) / 100.0f, .pSampleMask = nullptr, .alphaToCoverageEnable = key.state.alpha_to_coverage_enabled != 0 ? VK_TRUE : VK_FALSE, .alphaToOneEnable = key.state.alpha_to_one_enabled != 0 ? VK_TRUE : VK_FALSE,