Mesa (main): zink: Correct compiler issue with have_moltenvk member having been moved.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 4 09:27:08 UTC 2021


Module: Mesa
Branch: main
Commit: 18e8ec5f37f2922792775554ed775290d4cec7ac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18e8ec5f37f2922792775554ed775290d4cec7ac

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>

---

 src/gallium/drivers/zink/zink_resource.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 4a82acf236e..60db3c8a15d 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -973,7 +973,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;



More information about the mesa-commit mailing list