From f0dc8c0224fce3c2288ee30a4ec4bed088e06c72 Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Wed, 12 Nov 2025 17:20:05 -0500
Subject: [PATCH] zink: Return zink_device in create_logical_device

Fixes: 015eda4a4186c ("zink: deduplicate VkDevice and VkInstance")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38414>
---
 src/gallium/drivers/zink/zink_screen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 74a1a23fa62..2d08a88f787 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2732,7 +2732,7 @@ hack_it_up:
    return 1;
 }
 
-static VkDevice
+static struct zink_device*
 get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
 {
    VkDevice dev = VK_NULL_HANDLE;
@@ -2748,7 +2748,7 @@ get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
          continue;
       zdev->refcount++;
       simple_mtx_unlock(&device_lock);
-      return zdev->dev;
+      return zdev;
    }
 
    VkResult result = VKSCR(CreateDevice)(screen->pdev, dci, NULL, &dev);
@@ -2761,10 +2761,10 @@ get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
    zdev->dev = dev;
    _mesa_set_add(&device_table, zdev);
    simple_mtx_unlock(&device_lock);
-   return dev;
+   return zdev;
 }
 
-static VkDevice
+static struct zink_device*
 zink_create_logical_device(struct zink_screen *screen)
 {
    VkDeviceQueueCreateInfo qci[2] = {0};
@@ -3522,7 +3522,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
    init_driver_workarounds(screen);
    disable_features(screen);
 
-   screen->dev = zink_create_logical_device(screen);
+   screen->dev = zink_create_logical_device(screen)->dev;
    if (!screen->dev)
       goto fail;