Merge pull request #18087 from hrydgard/vsync-immediate-fix

Vulkan: Fix disabling VSync on SDL platforms that support IMMEDIATE but not MAILBOX
hrydgard · Sep 7, 2023 · 942a1c0 · 942a1c0
2 parents b49e44e + d9e9bde
commit 942a1c0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
@@ -1290,9 +1290,9 @@ bool VulkanContext::InitSwapchain() {
 	for (size_t i = 0; i < presentModeCount; i++) {
 		bool match = false;
 		match = match || ((flags_ & VULKAN_FLAG_PRESENT_MAILBOX) && presentModes[i] == VK_PRESENT_MODE_MAILBOX_KHR);
+		match = match || ((flags_ & VULKAN_FLAG_PRESENT_IMMEDIATE) && presentModes[i] == VK_PRESENT_MODE_IMMEDIATE_KHR);
 		match = match || ((flags_ & VULKAN_FLAG_PRESENT_FIFO_RELAXED) && presentModes[i] == VK_PRESENT_MODE_FIFO_RELAXED_KHR);
 		match = match || ((flags_ & VULKAN_FLAG_PRESENT_FIFO) && presentModes[i] == VK_PRESENT_MODE_FIFO_KHR);
-		match = match || ((flags_ & VULKAN_FLAG_PRESENT_IMMEDIATE) && presentModes[i] == VK_PRESENT_MODE_IMMEDIATE_KHR);
 
 		// Default to the first present mode from the list.
 		if (match || swapchainPresentMode == VK_PRESENT_MODE_MAX_ENUM_KHR) {

diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp
@@ -27,9 +27,14 @@ static const bool g_Validate = true;
 static const bool g_Validate = false;
 #endif
 
+// TODO: Share this between backends.
 static uint32_t FlagsFromConfig() {
-	uint32_t flags = 0;
-	flags = g_Config.bVSync ? VULKAN_FLAG_PRESENT_FIFO : VULKAN_FLAG_PRESENT_MAILBOX;
+	uint32_t flags;
+	if (g_Config.bVSync) {
+		flags = VULKAN_FLAG_PRESENT_FIFO;
+	} else {
+		flags = VULKAN_FLAG_PRESENT_MAILBOX | VULKAN_FLAG_PRESENT_IMMEDIATE;
+	}
 	if (g_Validate) {
 		flags |= VULKAN_FLAG_VALIDATE;
 	}

diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp
@@ -13,27 +13,34 @@
 #include "Core/ConfigValues.h"
 #include "Core/System.h"
 
-AndroidVulkanContext::AndroidVulkanContext() {}
 
-AndroidVulkanContext::~AndroidVulkanContext() {
-	delete g_Vulkan;
-	g_Vulkan = nullptr;
-}
+#ifdef _DEBUG
+static const bool g_Validate = true;
+#else
+static const bool g_Validate = false;
+#endif
 
+// TODO: Share this between backends.
 static uint32_t FlagsFromConfig() {
 	uint32_t flags;
-
 	if (g_Config.bVSync) {
 		flags = VULKAN_FLAG_PRESENT_FIFO;
 	} else {
-		flags = VULKAN_FLAG_PRESENT_MAILBOX | VULKAN_FLAG_PRESENT_FIFO_RELAXED;
+		flags = VULKAN_FLAG_PRESENT_MAILBOX | VULKAN_FLAG_PRESENT_IMMEDIATE;
+	}
+	if (g_Validate) {
+		flags |= VULKAN_FLAG_VALIDATE;
 	}
-#ifdef _DEBUG
-	flags |= VULKAN_FLAG_VALIDATE;
-#endif
 	return flags;
 }
 
+AndroidVulkanContext::AndroidVulkanContext() {}
+
+AndroidVulkanContext::~AndroidVulkanContext() {
+	delete g_Vulkan;
+	g_Vulkan = nullptr;
+}
+
 bool AndroidVulkanContext::InitAPI() {
 	INFO_LOG(G3D, "AndroidVulkanContext::Init");
 	init_glslang();