Fix Vulkan presentation semaphore reuse

src/command_buffer.cpp

@@ -1260,16 +1260,12 @@ void CommandBuffer::start() {
     auto &state = vulkan::commandBufferState(this);
     auto &deviceState = vulkan::deviceState(device);
 
-    if (state.imageAvailableSemaphore == VK_NULL_HANDLE ||
-        state.renderFinishedSemaphore == VK_NULL_HANDLE) {
+    if (state.imageAvailableSemaphore == VK_NULL_HANDLE) {
         VkSemaphoreCreateInfo semaphoreInfo{};
         semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
         VULKAN_GUARD(vkCreateSemaphore(deviceState.device, &semaphoreInfo,
                                        nullptr, &state.imageAvailableSemaphore),
                      "Failed to create Vulkan image available semaphore");
-        VULKAN_GUARD(vkCreateSemaphore(deviceState.device, &semaphoreInfo,
-                                       nullptr, &state.renderFinishedSemaphore),
-                     "Failed to create Vulkan render finished semaphore");
     }
 
     if (state.inFlightFence == VK_NULL_HANDLE) {
@@ -2114,7 +2110,10 @@ void CommandBuffer::commit() {
     VkSemaphoreSubmitInfo signalInfo{};
     signalInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO;
 
-    signalInfo.semaphore = state.renderFinishedSemaphore;
+    signalInfo.semaphore = state.needsPresent
+                               ? contextState.renderFinishedSemaphores.at(
+                                     state.imageIndex)
+                               : VK_NULL_HANDLE;
 
     signalInfo.stageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT;
 
@@ -2142,7 +2141,7 @@ void CommandBuffer::commit() {
         VkPresentInfoKHR presentInfo{};
         presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
         presentInfo.waitSemaphoreCount = 1;
-        presentInfo.pWaitSemaphores = &state.renderFinishedSemaphore;
+        presentInfo.pWaitSemaphores = &signalInfo.semaphore;
         presentInfo.swapchainCount = 1;
         presentInfo.pSwapchains = &contextState.swapchain;
         presentInfo.pImageIndices = &state.imageIndex;
@@ -2185,7 +2184,7 @@ void CommandBuffer::waitForSubmittedWork() {
     state.inFlightResources.clear();
 #elif defined(VULKAN)
     auto &state = vulkan::commandBufferState(this);
-    if (state.inFlightFence == VK_NULL_HANDLE) {
+    if (state.inFlightFence == VK_NULL_HANDLE || !state.submitted) {
         return;
     }
 

src/vulkan/vulkan_image.cpp

@@ -154,10 +154,19 @@ void createSwapchainImages(ContextState &contextState,
                             contextState.swapchainImages.data());
 
     contextState.swapchainImageViews.resize(swapchainImageCount);
+    contextState.renderFinishedSemaphores.resize(swapchainImageCount,
+                                                VK_NULL_HANDLE);
     contextState.swapchainImageLayouts.resize(swapchainImageCount,
                                               VK_IMAGE_LAYOUT_UNDEFINED);
 
     for (size_t i = 0; i < swapchainImageCount; i++) {
+        VkSemaphoreCreateInfo semaphoreInfo{};
+        semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+        VULKAN_GUARD(
+            vkCreateSemaphore(deviceState.device, &semaphoreInfo, nullptr,
+                              &contextState.renderFinishedSemaphores[i]),
+            "Failed to create Vulkan presentation semaphore");
+
         VkImageViewCreateInfo viewInfo{};
         viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
         viewInfo.image = contextState.swapchainImages[i];
@@ -190,6 +199,12 @@ void destroySwapchain(ContextState &contextState, DeviceState &deviceState) {
             vkDestroyImageView(deviceState.device, imageView, nullptr);
         }
     }
+    for (VkSemaphore semaphore : contextState.renderFinishedSemaphores) {
+        if (semaphore != VK_NULL_HANDLE) {
+            vkDestroySemaphore(deviceState.device, semaphore, nullptr);
+        }
+    }
+    contextState.renderFinishedSemaphores.clear();
     contextState.swapchainImageViews.clear();
     contextState.swapchainImages.clear();
     contextState.swapchainImageLayouts.clear();

src/vulkan/vulkan_state.cpp

@@ -308,11 +308,6 @@ void releaseDeviceState(Device *device) {
                                    commandState.imageAvailableSemaphore,
                                    nullptr);
             }
-            if (commandState.renderFinishedSemaphore != VK_NULL_HANDLE) {
-                vkDestroySemaphore(state.device,
-                                   commandState.renderFinishedSemaphore,
-                                   nullptr);
-            }
             if (commandState.inFlightFence != VK_NULL_HANDLE) {
                 vkDestroyFence(state.device, commandState.inFlightFence,
                                nullptr);
@@ -361,10 +356,6 @@ void releaseCommandBufferState(CommandBuffer *commandBuffer) {
             vkDestroySemaphore(state.device, state.imageAvailableSemaphore,
                                nullptr);
         }
-        if (state.renderFinishedSemaphore != VK_NULL_HANDLE) {
-            vkDestroySemaphore(state.device, state.renderFinishedSemaphore,
-                               nullptr);
-        }
         if (state.inFlightFence != VK_NULL_HANDLE) {
             vkDestroyFence(state.device, state.inFlightFence, nullptr);
         }

src/vulkan/vulkan_state.h

@@ -64,6 +64,7 @@ struct ContextState {
 
     std::vector<VkImage> swapchainImages;
     std::vector<VkImageView> swapchainImageViews;
+    std::vector<VkSemaphore> renderFinishedSemaphores;
 
     uint32_t currentSwapchainImageIndex = UINT32_MAX;
 
@@ -155,7 +156,6 @@ struct CommandBufferState {
     bool submitted = false;
 
     VkSemaphore imageAvailableSemaphore = VK_NULL_HANDLE;
-    VkSemaphore renderFinishedSemaphore = VK_NULL_HANDLE;
     VkFence inFlightFence = VK_NULL_HANDLE;
 
     bool clearColorPending = false;