diff options
| author | Georg Lehmann <dadschoorse@gmail.com> | 2020-02-05 18:06:55 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-07 09:21:47 -0800 |
| commit | 1e0cc313ba0bd27ed878e80987f865e37f9c3360 (patch) | |
| tree | cfc2a18c0871321ec49a23ac4bde580ba9510aed | |
| parent | d96f0faacf8aa9ae08d05bbcaaed53504ae61d4c (diff) | |
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: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3718>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3718>
(cherry picked from commit 1c79afd94620925cb9e0903f24f91c3ab9ecfcb4)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/vulkan/overlay-layer/overlay.cpp | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1f993aa183a..95ba23ed695 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -247,7 +247,7 @@ "description": "Correctly wait in the fragment stage until all semaphores are signaled", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, 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; } |