From cdf101455d488a9dadb74765d5250dbc34472165 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 15 Dec 2021 11:08:17 +0200 Subject: [PATCH] vulkan: fix missing handling of WSI memory signal Signed-off-by: Lionel Landwerlin Fixes: b996fa8efaa4 ("anv: implement VK_KHR_synchronization2") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5744 Reviewed-by: Jason Ekstrand Part-of: --- src/vulkan/runtime/vk_synchronization2.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/vulkan/runtime/vk_synchronization2.c b/src/vulkan/runtime/vk_synchronization2.c index 0189134dc21..0ad796c7b5b 100644 --- a/src/vulkan/runtime/vk_synchronization2.c +++ b/src/vulkan/runtime/vk_synchronization2.c @@ -27,6 +27,7 @@ #include "vk_device.h" #include "vk_queue.h" #include "vk_util.h" +#include "../wsi/wsi_common.h" VKAPI_ATTR void VKAPI_CALL vk_common_CmdWriteTimestamp( @@ -291,6 +292,7 @@ vk_common_QueueSubmit( STACK_ARRAY(VkSubmitInfo2KHR, submit_info_2, submitCount); STACK_ARRAY(VkPerformanceQuerySubmitInfoKHR, perf_query_submit_info, submitCount); + STACK_ARRAY(struct wsi_memory_signal_submit_info, wsi_mem_submit_info, submitCount); uint32_t n_wait_semaphores = 0; uint32_t n_command_buffers = 0; @@ -373,6 +375,15 @@ vk_common_QueueSubmit( __vk_append_struct(&submit_info_2[s], &perf_query_submit_info[s]); } + const struct wsi_memory_signal_submit_info *mem_signal_info = + vk_find_struct_const(pSubmits[s].pNext, + WSI_MEMORY_SIGNAL_SUBMIT_INFO_MESA); + if (mem_signal_info) { + wsi_mem_submit_info[s] = *mem_signal_info; + wsi_mem_submit_info[s].pNext = NULL; + __vk_append_struct(&submit_info_2[s], &wsi_mem_submit_info[s]); + } + n_wait_semaphores += pSubmits[s].waitSemaphoreCount; n_command_buffers += pSubmits[s].commandBufferCount; n_signal_semaphores += pSubmits[s].signalSemaphoreCount; @@ -388,6 +399,7 @@ vk_common_QueueSubmit( STACK_ARRAY_FINISH(signal_semaphores); STACK_ARRAY_FINISH(submit_info_2); STACK_ARRAY_FINISH(perf_query_submit_info); + STACK_ARRAY_FINISH(wsi_mem_submit_info); return result; }