From ad718604074b223c97fb21b153a48fc28c548ad7 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Sun, 1 Feb 2026 21:47:21 -0400 Subject: [PATCH] [vulkan] Removing Static mode for pipeline compilations --- src/common/settings.h | 4 +-- src/common/settings_enums.h | 2 +- .../vulkan_common/vulkan_device.cpp | 25 ------------------- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 5c758e9642..0d7f38662b 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -535,9 +535,9 @@ struct Values { #elif defined (__FreeBSD__) ExtendedDynamicState::EDS3, #elif defined (ANDROID) - ExtendedDynamicState::Static, + ExtendedDynamicState::Core, #elif defined (__APPLE__) - ExtendedDynamicState::Static, + ExtendedDynamicState::Core, #else ExtendedDynamicState::EDS2, #endif diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index b009f45675..13633d23b7 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -153,7 +153,7 @@ ENUM(GpuUnswizzleSize, VerySmall, Small, Normal, Large, VeryLarge) ENUM(GpuUnswizzle, VeryLow, Low, Normal, Medium, High) ENUM(GpuUnswizzleChunk, VeryLow, Low, Normal, Medium, High) ENUM(TemperatureUnits, Celsius, Fahrenheit) -ENUM(ExtendedDynamicState, Static, Core, EDS1, EDS2, EDS3); +ENUM(ExtendedDynamicState, Core, EDS1, EDS2, EDS3); ENUM(GpuLogLevel, Off, Errors, Standard, Verbose, All) template diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 7f67c8c210..1fa97e8c1f 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -651,18 +651,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR const auto dyna_state = Settings::values.dyna_state.GetValue(); switch (dyna_state) { - case Settings::ExtendedDynamicState::Static: - LOG_INFO(Render_Vulkan, "STATIC Mode (fully static pipelines)"); - RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, - VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); - RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2, - VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); - RemoveExtensionFeature(extensions.extended_dynamic_state3, features.extended_dynamic_state3, - VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME); - dynamic_state3_blending = false; - dynamic_state3_enables = false; - supports_dynamic_state = false; - break; case Settings::ExtendedDynamicState::Core: LOG_INFO(Render_Vulkan, "DynamicState - Enabled"); RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, @@ -1209,19 +1197,6 @@ bool Device::GetSuitability(bool requires_swapchain) { } } - const auto dyna_state_setting = Settings::values.dyna_state.GetValue(); - if (dyna_state_setting == Settings::ExtendedDynamicState::Static) { - LOG_INFO(Render_Vulkan, "Static pipeline mode: All dynamic states disabled"); - supports_dynamic_state = false; - features.extended_dynamic_state.extendedDynamicState = false; - features.extended_dynamic_state2.extendedDynamicState2 = false; - features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; - features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; - features.extended_dynamic_state3.extendedDynamicState3ColorWriteMask = false; - features.extended_dynamic_state3.extendedDynamicState3DepthClampEnable = false; - features.extended_dynamic_state3.extendedDynamicState3LogicOpEnable = false; - } - return suitable; }