From 1c79afd94620925cb9e0903f24f91c3ab9ecfcb4 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 5 Feb 2020 18:06:55 +0000 Subject: [PATCH] Correctly wait in the fragment stage until all semaphores are signaled This fixes two issues: - a crash if the application uses more than one semaphore for presenting because the driver expects one stage per semaphore - the swapchain image could be not ready yet if the semaphores aren't signaled, #946 is possible related Cc: Reviewed-by: Lionel Landwerlin Tested-by: Marge Bot Part-of: --- src/vulkan/overlay-layer/overlay.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/vulkan/overlay-layer/overlay.cpp b/src/vulkan/overlay-layer/overlay.cpp index 6ec2f05826a..36fb96f1444 100644 --- a/src/vulkan/overlay-layer/overlay.cpp +++ b/src/vulkan/overlay-layer/overlay.cpp @@ -1344,18 +1344,26 @@ static struct overlay_draw *render_swapchain_display(struct swapchain_data *data device_data->vtable.EndCommandBuffer(draw->command_buffer); + VkPipelineStageFlags *stages_wait = (VkPipelineStageFlags*) malloc(sizeof(VkPipelineStageFlags) * n_wait_semaphores); + for (unsigned i = 0; i < n_wait_semaphores; i++) + { + // wait in the fragment stage until the swapchain image is ready + stages_wait[i] = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; + } + VkSubmitInfo submit_info = {}; - VkPipelineStageFlags stage_wait = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.commandBufferCount = 1; submit_info.pCommandBuffers = &draw->command_buffer; - submit_info.pWaitDstStageMask = &stage_wait; + submit_info.pWaitDstStageMask = stages_wait; submit_info.waitSemaphoreCount = n_wait_semaphores; submit_info.pWaitSemaphores = wait_semaphores; submit_info.signalSemaphoreCount = 1; submit_info.pSignalSemaphores = &draw->semaphore; device_data->vtable.QueueSubmit(device_data->graphic_queue->queue, 1, &submit_info, draw->fence); + + free(stages_wait); return draw; } -- 2.30.2