Mesa (staging/22.1): zink: fix kopper_acquire return value

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 20 12:29:19 2022 -0400

zink: fix kopper_acquire return value

this should be a VkResult

Fixes: ab1941fc0e9 ("zink: handle zombie swapchains")

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>
(cherry picked from commit c1ce1889db94385a1584ee45481a099bcf229ab8)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_kopper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index df082b234a8..1c47049335e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -616,7 +616,7 @@
         "description": "zink: fix kopper_acquire return value",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ab1941fc0e990d10e050d6e8a75fc1fa9fb75456"
     },
diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c
index e6d5156d1d3..8f7acf464f9 100644
--- a/src/gallium/drivers/zink/zink_kopper.c
+++ b/src/gallium/drivers/zink/zink_kopper.c
@@ -450,7 +450,7 @@ kopper_acquire(struct zink_screen *screen, struct zink_resource *res, uint64_t t
 {
    struct kopper_displaytarget *cdt = kopper_displaytarget(res->obj->dt);
    if (res->obj->acquire)
-      return true;
+      return VK_SUCCESS;
    res->obj->acquire = VK_NULL_HANDLE;
    VkSemaphore acquire = VK_NULL_HANDLE;