lavapipe: move queue to base object

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9550>

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index 10ed9ee..f1da7f7 100644 (file)
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -894,7 +894,6 @@ static int queue_thread(void *data)
 static VkResult
 lvp_queue_init(struct lvp_device *device, struct lvp_queue *queue)
 {
-   queue->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
    queue->device = device;
 
    queue->flags = 0;
@@ -904,6 +903,7 @@ lvp_queue_init(struct lvp_device *device, struct lvp_queue *queue)
    mtx_init(&queue->m, mtx_plain);
    queue->exec_thread = u_thread_create(queue_thread, queue);
 
+   vk_object_base_init(&device->vk, &queue->base, VK_OBJECT_TYPE_QUEUE);
    return VK_SUCCESS;
 }
 

diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h
index 72532c9..d4f941c 100644 (file)
--- a/src/gallium/frontends/lavapipe/lvp_private.h
+++ b/src/gallium/frontends/lavapipe/lvp_private.h
@@ -232,7 +232,7 @@ bool lvp_physical_device_extension_supported(struct lvp_physical_device *dev,
                                               const char *name);
 
 struct lvp_queue {
-   VK_LOADER_DATA                              _loader_data;
+   struct vk_object_base base;
    VkDeviceQueueCreateFlags flags;
    struct lvp_device *                         device;
    struct pipe_context *ctx;