Module: Mesa Branch: staging/22.0 Commit: 23930f4b00e22e7688d8e9ee6f4f894f45ece24e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23930f4b00e22e7688d8e9ee6f4f894f45ece24e
Author: Jason Ekstrand <[email protected]> Date: Mon Apr 25 11:08:42 2022 -0500 vulkan: Set signals[i].stageMask = ALL_COMMANDS for QueueSubmit2 wrapping My understanding of the signal masks is that they control what stages must complete before the semaphore is signaled. Using 0 theoretically means the semaphore could be signaled immediately without waiting on anything. Use ~0 instead to say it depends on everything. Fixes: 97f0a4494b97 ("vulkan: implement legacy entrypoints on top of VK_KHR_synchronization2") Reviewed-by: Iago Toral Quiroga <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16145> (cherry picked from commit 02fea6c179b00bd9dad179638ee1491c1acea65a) --- .pick_status.json | 2 +- src/vulkan/runtime/vk_synchronization2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 52ab9072931..bfa398fa8e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -204,7 +204,7 @@ "description": "vulkan: Set signals[i].stageMask = ALL_COMMANDS for QueueSubmit2 wrapping", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "97f0a4494b97d89146cf66dfa0c9b1946bf3fc22" }, { diff --git a/src/vulkan/runtime/vk_synchronization2.c b/src/vulkan/runtime/vk_synchronization2.c index 0ad796c7b5b..621bc2f36d1 100644 --- a/src/vulkan/runtime/vk_synchronization2.c +++ b/src/vulkan/runtime/vk_synchronization2.c @@ -346,7 +346,7 @@ vk_common_QueueSubmit( .sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR, .semaphore = pSubmits[s].pSignalSemaphores[i], .value = signal_values ? signal_values[i] : 0, - .stageMask = 0, + .stageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, .deviceIndex = group_info ? group_info->pSignalSemaphoreDeviceIndices[i] : 0, }; }
