From cbfa7229e9f0166d639af41c81a7f87c96364e51 Mon Sep 17 00:00:00 2001
From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com>
Date: Wed, 14 Aug 2024 17:43:04 +0200
Subject: [PATCH] I've made up my mind. This is right.

---
 .../Latte/Renderer/Vulkan/SwapchainInfoVk.cpp |  2 +-
 .../Latte/Renderer/Vulkan/SwapchainInfoVk.h   |  4 +--
 .../Latte/Renderer/Vulkan/VulkanRenderer.cpp  | 26 +++++++------------
 .../HW/Latte/Renderer/Vulkan/VulkanRenderer.h |  1 -
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp
index e76f95294..8b5637f01 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp
@@ -348,7 +348,7 @@ VkPresentModeKHR SwapchainInfoVk::ChoosePresentMode(const std::vector<VkPresentM
 		return VK_PRESENT_MODE_FIFO_KHR;
 	}
 
-	m_maxQueued = 2;
+	m_maxQueued = 1;
 	return VK_PRESENT_MODE_FIFO_KHR;
 }
 
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h
index 0c49d3ab2..7048b2735 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.h
@@ -69,8 +69,8 @@ struct SwapchainInfoVk
 	Vector2i m_desiredExtent{};
 	uint32 swapchainImageIndex = (uint32)-1;
 	uint64 m_presentId = 1;
-	uint64 m_queueDepth = 0; // number of frames finished on the CPU, with submitted work and presentation requests
-	uint64 m_maxQueued = 0; // maximum number of frames that should be "in-flight" at a time
+	uint64 m_queueDepth = 0; // number of frames with pending presentation requests
+	uint64 m_maxQueued = 0; // the maximum number of frames with presentation requests.
 
 
 	// swapchain image ringbuffer (indexed by swapchainImageIndex)
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
index 13b7ebb7c..2386e0dc1 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
@@ -2640,16 +2640,6 @@ bool VulkanRenderer::AcquireNextSwapchainImage(bool mainWindow)
 	if (!UpdateSwapchainProperties(mainWindow))
 		return false;
 
-	if(UsePresentWait(chainInfo))
-	{
-		if(chainInfo.m_queueDepth + 1 >= chainInfo.m_maxQueued)
-		{
-			uint64 waitFrameId = chainInfo.m_presentId - chainInfo.m_queueDepth;
-			vkWaitForPresentKHR(m_logicalDevice, chainInfo.m_swapchain, waitFrameId, 40'000'000);
-			chainInfo.m_queueDepth--;
-		}
-	}
-
 	bool result = chainInfo.AcquireImage();
 	if (!result)
 		return false;
@@ -2687,11 +2677,6 @@ void VulkanRenderer::RecreateSwapchain(bool mainWindow, bool skipCreate)
 		ImguiInit();
 }
 
-bool VulkanRenderer::UsePresentWait(const SwapchainInfoVk& chain) const
-{
-	return m_featureControl.deviceExtensions.present_wait && chain.m_maxQueued > 0;
-}
-
 bool VulkanRenderer::UpdateSwapchainProperties(bool mainWindow)
 {
 	auto& chainInfo = GetChainInfo(mainWindow);
@@ -2764,13 +2749,21 @@ void VulkanRenderer::SwapBuffer(bool mainWindow)
 	presentInfo.pWaitSemaphores = &presentSemaphore;
 
 	// if present_wait is available and enabled, add frame markers to present requests
-	if (UsePresentWait(chainInfo))
+	// and limit the number of queued present operations
+	if (m_featureControl.deviceExtensions.present_wait && chainInfo.m_maxQueued > 0)
 	{
 		presentId.sType = VK_STRUCTURE_TYPE_PRESENT_ID_KHR;
 		presentId.swapchainCount = 1;
 		presentId.pPresentIds = &chainInfo.m_presentId;
 
 		presentInfo.pNext = &presentId;
+
+		if(chainInfo.m_queueDepth >= chainInfo.m_maxQueued)
+		{
+			uint64 waitFrameId = chainInfo.m_presentId - chainInfo.m_queueDepth;
+			vkWaitForPresentKHR(m_logicalDevice, chainInfo.m_swapchain, waitFrameId, 40'000'000);
+			chainInfo.m_queueDepth--;
+		}
 	}
 
 	VkResult result = vkQueuePresentKHR(m_presentQueue, &presentInfo);
@@ -2787,7 +2780,6 @@ void VulkanRenderer::SwapBuffer(bool mainWindow)
 		chainInfo.m_presentId++;
 	}
 
-
 	chainInfo.hasDefinedSwapchainImage = false;
 
 	chainInfo.swapchainImageIndex = -1;
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h
index f92048b5f..4111db532 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h
@@ -552,7 +552,6 @@ class VulkanRenderer : public Renderer
 	VkPipeline backbufferBlit_createGraphicsPipeline(VkDescriptorSetLayout descriptorLayout, bool padView, RendererOutputShader* shader);
 	bool AcquireNextSwapchainImage(bool mainWindow);
 	void RecreateSwapchain(bool mainWindow, bool skipCreate = false);
-	bool UsePresentWait(const SwapchainInfoVk& chain) const;
 
 	// streamout
 	void streamout_setupXfbBuffer(uint32 bufferIndex, sint32 ringBufferOffset, uint32 rangeAddr, uint32 rangeSize) override;