Fixed semaphore handling in VulkanSwapChain (nadult#14)

TedLyngmo · Sep 22, 2024 · b2e9cb7 · b2e9cb7
1 parent bb0c8f1
commit b2e9cb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/include/fwk/vulkan/vulkan_swap_chain.h b/include/fwk/vulkan/vulkan_swap_chain.h
@@ -55,11 +55,12 @@ class VulkanSwapChain : public VulkanObjectBase<VulkanSwapChain> {
 	VWindowRef m_window;
 	VSwapChainSetup m_setup;
 	vector<PVImageView> m_image_views;
-	VkSemaphore m_semaphores[2] = {};
+	array<VkSemaphore, 4> m_semaphores = {};
 	VkQueue m_present_queue;
 	VkFormat m_format;
 	int2 m_size;
 	uint m_image_index = 0;
+	uint m_semaphore_index = 0;
 	Status m_status = Status::initialized;
 };
 }
diff --git a/src/vulkan/vulkan_swap_chain.cpp b/src/vulkan/vulkan_swap_chain.cpp
@@ -167,10 +167,10 @@ Ex<VkSemaphore> VulkanSwapChain::acquireImage() {
 			return nullptr;
 	}
 
-	VkResult result;
+	auto semaphore = m_semaphores[m_semaphore_index];
 	for(int retry = 0; retry < 2; retry++) {
-		result = vkAcquireNextImageKHR(deviceHandle(), m_handle, UINT64_MAX, m_semaphores[0],
-									   VK_NULL_HANDLE, &m_image_index);
+		VkResult result = vkAcquireNextImageKHR(deviceHandle(), m_handle, UINT64_MAX, semaphore,
+												VK_NULL_HANDLE, &m_image_index);
 		if(result == VK_SUCCESS)
 			break;
 		EXPECT(recreate());
@@ -179,8 +179,10 @@ Ex<VkSemaphore> VulkanSwapChain::acquireImage() {
 	}
 
 	m_status = Status::image_acquired;
-	swap(m_semaphores[0], m_semaphores[1]);
-	return m_semaphores[1];
+	m_semaphore_index++;
+	if(m_semaphore_index >= m_semaphores.size())
+		m_semaphore_index = 0;
+	return semaphore;
 }
 
 PVImageView VulkanSwapChain::acquiredImage() const {