Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

fix vk extension removal

swurl89c06a73836b
diff --git a/.ci/linux/package.sh b/.ci/linux/package.sh
index 4d58b8f328..5c556cd0e4 100755
--- a/.ci/linux/package.sh
+++ b/.ci/linux/package.sh
@@ -21,7 +21,6 @@ fi
EDEN_TAG=$(git describe --tags --abbrev=0)
echo "Making stable \"$EDEN_TAG\" build"
-git checkout "$EDEN_TAG"
VERSION="$(echo "$EDEN_TAG")"
# NOW MAKE APPIMAGE
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 9607487a50..87cfe06086 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -1190,7 +1190,7 @@ void Device::RemoveUnsuitableExtensions() {
int dynamic_state = Settings::values.dyna_state.GetValue();
// VK_EXT_extended_dynamic_state
- if (dynamic_state < 1) {
+ if (dynamic_state > 0) {
extensions.extended_dynamic_state = features.extended_dynamic_state.extendedDynamicState;
RemoveExtensionFeatureIfUnsuitable(extensions.extended_dynamic_state,
features.extended_dynamic_state,
@@ -1202,7 +1202,7 @@ void Device::RemoveUnsuitableExtensions() {
}
// VK_EXT_extended_dynamic_state2
- if (dynamic_state < 2) {
+ if (dynamic_state > 1) {
extensions.extended_dynamic_state2 = features.extended_dynamic_state2.extendedDynamicState2;
RemoveExtensionFeatureIfUnsuitable(extensions.extended_dynamic_state2,
features.extended_dynamic_state2,
@@ -1214,7 +1214,7 @@ void Device::RemoveUnsuitableExtensions() {
}
// VK_EXT_extended_dynamic_state3
- if (dynamic_state < 3) {
+ if (dynamic_state > 2) {
dynamic_state3_blending
= features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable
&& features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation