Mesa (staging/22.1): vulkan/wsi: Set the right stage flags for semaphore waits

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: aab9d6df50edf822777305468619a9ba8ef9cd4e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aab9d6df50edf822777305468619a9ba8ef9cd4e

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri May 21 15:31:06 2021 -0500

vulkan/wsi: Set the right stage flags for semaphore waits

This is currently technically broken for compute.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Cc: mesa-stable at lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16333>
(cherry picked from commit 233be8ee592a0119501d9459fdafdc94c70902a4)

---

 .pick_status.json           | 2 +-
 src/vulkan/wsi/wsi_common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8a7ddb57478..aabe3523cc7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "vulkan/wsi: Set the right stage flags for semaphore waits",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
index 10f98844098..a2532d93032 100644
--- a/src/vulkan/wsi/wsi_common.c
+++ b/src/vulkan/wsi/wsi_common.c
@@ -964,7 +964,7 @@ wsi_common_queue_present(const struct wsi_device *wsi,
             goto fail_present;
          }
          for (uint32_t s = 0; s < pPresentInfo->waitSemaphoreCount; s++)
-            stage_flags[s] = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT;
+            stage_flags[s] = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
 
          submit_info.pWaitDstStageMask = stage_flags;
       }