Mesa (main): zink: initialize dispatch-table before queue-init

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jun 23 08:49:01 2021 +0200

zink: initialize dispatch-table before queue-init

This matters in the next patch, where we call vk-functions through the
dispatch-table instead.

Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11550>

---

 src/gallium/drivers/zink/zink_screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 3550957145c..9e92284f6d5 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2099,6 +2099,8 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
    if (!screen->dev)
       goto fail;
 
+   vk_device_dispatch_table_load(&screen->vk.device, &vkGetDeviceProcAddr, screen->dev);
+
    init_queue(screen);
    if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_RADV ||
        screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_OPEN_SOURCE ||
@@ -2106,8 +2108,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
       /* this has bad perf on AMD */
       screen->info.have_KHR_push_descriptor = false;
 
-   vk_device_dispatch_table_load(&screen->vk.device, &vkGetDeviceProcAddr, screen->dev);
-
    zink_verify_device_extensions(screen);
 
    if (screen->info.have_EXT_calibrated_timestamps && !check_have_device_time(screen))