Mesa (staging/21.3): vulkan: fix missing handling of WSI memory signal

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 9d6580765db5b5413ff18c8655c3398127e1c890
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d6580765db5b5413ff18c8655c3398127e1c890

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Dec 15 11:08:17 2021 +0200

vulkan: fix missing handling of WSI memory signal

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: b996fa8efaa4 ("anv: implement VK_KHR_synchronization2")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5744
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14237>
(cherry picked from commit cdf101455d488a9dadb74765d5250dbc34472165)

---

 .pick_status.json                     |  2 +-
 src/vulkan/util/vk_synchronization2.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2069841a596..68d70f315ef 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -211,7 +211,7 @@
         "description": "vulkan: fix missing handling of WSI memory signal",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b996fa8efaa42558bda2c52377561d7eb3c4127e"
     },
diff --git a/src/vulkan/util/vk_synchronization2.c b/src/vulkan/util/vk_synchronization2.c
index 0189134dc21..0ad796c7b5b 100644
--- a/src/vulkan/util/vk_synchronization2.c
+++ b/src/vulkan/util/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;
 }