From 2c257e2628118150e3c0966dd0fa9db5902f4ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 19 Jun 2024 10:50:41 +0200
Subject: [PATCH] Vulkan submit: If submit-type is FinishFrame, always trigger
 the fence.

Should fix #19277
---
 Common/GPU/Vulkan/VulkanFrameData.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Common/GPU/Vulkan/VulkanFrameData.cpp b/Common/GPU/Vulkan/VulkanFrameData.cpp
index a95dd42b19..f2be38d298 100644
--- a/Common/GPU/Vulkan/VulkanFrameData.cpp
+++ b/Common/GPU/Vulkan/VulkanFrameData.cpp
@@ -208,10 +208,11 @@ void FrameData::Submit(VulkanContext *vulkan, FrameSubmitType type, FrameDataSha
 
 		cmdBufs[numCmdBufs++] = presentCmd;
 		hasPresentCommands = false;
+	}
 
-		if (type == FrameSubmitType::FinishFrame) {
-			fenceToTrigger = fence;
-		}
+	if (type == FrameSubmitType::FinishFrame) {
+		_dbg_assert_(!fenceToTrigger);
+		fenceToTrigger = fence;
 	}
 
 	if (!numCmdBufs && fenceToTrigger == VK_NULL_HANDLE) {