Mesa (staging/21.1): zink: Correct compiler issue with have_moltenvk member having been moved.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 90bcb5a11a428583afaf7b2ded234f2c65636b6f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=90bcb5a11a428583afaf7b2ded234f2c65636b6f

Author: Duncan Hopkins <duncan at duncanhopkins.me.uk>
Date:   Thu Jun  3 14:07:29 2021 +0100

zink: Correct compiler issue with have_moltenvk member having been moved.

have_moltenvk was moved to a different location but code being protected in platform specific guard, so was unnoticed.

Fixes: 598dc3dca41 ("zink: use cached memory for all resources when possible")

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11129>
(cherry picked from commit 18e8ec5f37f2922792775554ed775290d4cec7ac)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index c5174ad0600..932beaa183c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,7 @@
         "description": "zink: Correct compiler issue with have_moltenvk member having been moved.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "598dc3dca41e3b1a9bf9e94b17e5426773ed6830"
     },
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index ec5f539fde3..f636baf7b7b 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -913,7 +913,7 @@ buffer_transfer_map(struct zink_context *ctx, struct zink_resource *res, unsigne
       // This is a known limitation of MoltenVK.
       // See https://github.com/KhronosGroup/MoltenVK/blob/master/Docs/MoltenVK_Runtime_UserGuide.md#known-moltenvk-limitations
 
-       || screen->have_moltenvk
+       || screen->instance_info.have_MVK_moltenvk
 #endif
       ) {
       VkDeviceSize size = box->width;