Mesa (master): zink: fix debug utils init

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2f8237754b8125885a55b5378007901c81ccecd9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f8237754b8125885a55b5378007901c81ccecd9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Dec 23 19:15:38 2020 -0500

zink: fix debug utils init

this was moved to a different struct without being updated

Fixes: fe669ff4a02 ("zink: replace old code with generated zink_instance")

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8220>

---

 src/gallium/drivers/zink/zink_screen.c | 2 +-
 src/gallium/drivers/zink/zink_screen.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 8d29074b941..3b14b086df8 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1064,7 +1064,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
    if (!load_instance_extensions(screen))
       goto fail;
 
-   if (screen->have_debug_utils_ext && !create_debug(screen))
+   if (screen->instance_info.have_EXT_debug_utils && !create_debug(screen))
       debug_printf("ZINK: failed to setup debug utils\n");
 
    screen->pdev = choose_pdev(screen->instance);
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 45cf5c9f250..146d00073d9 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -74,8 +74,6 @@ struct zink_screen {
    uint32_t loader_version;
    bool have_physical_device_prop2_ext;
 
-   bool have_debug_utils_ext;
-
    bool needs_mesa_wsi;
 
 #if defined(MVK_VERSION)