Module: Mesa Branch: main Commit: c9dbd3c06ec084f73e7c6342ade1a45ef8ce778b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9dbd3c06ec084f73e7c6342ade1a45ef8ce778b
Author: Yevhenii Kolesnikov <[email protected]> Date: Tue Apr 6 15:30:32 2021 +0300 v3dv: Use a common vk_queue structure Switch to using common structure. Signed-off-by: Yevhenii Kolesnikov <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Alejandro Piñeiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13000> --- src/broadcom/vulkan/v3dv_device.c | 6 ++++-- src/broadcom/vulkan/v3dv_private.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index fec53ec38c5..0d104ec3674 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1678,7 +1678,9 @@ v3dv_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, static VkResult queue_init(struct v3dv_device *device, struct v3dv_queue *queue) { - vk_object_base_init(&device->vk, &queue->base, VK_OBJECT_TYPE_QUEUE); + VkResult result = vk_queue_init(&queue->vk, &device->vk); + if (result != VK_SUCCESS) + return result; queue->device = device; queue->flags = 0; queue->noop_job = NULL; @@ -1690,7 +1692,7 @@ queue_init(struct v3dv_device *device, struct v3dv_queue *queue) static void queue_finish(struct v3dv_queue *queue) { - vk_object_base_finish(&queue->base); + vk_queue_finish(&queue->vk); assert(list_is_empty(&queue->submit_wait_list)); if (queue->noop_job) v3dv_job_destroy(queue->noop_job); diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index fe29c935406..1d006a5440e 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -44,6 +44,7 @@ #include "vk_util.h" #include "vk_command_buffer.h" +#include "vk_queue.h" #include <xf86drm.h> @@ -218,7 +219,7 @@ struct v3dv_queue_submit_wait_info { }; struct v3dv_queue { - struct vk_object_base base; + struct vk_queue vk; struct v3dv_device *device; VkDeviceQueueCreateFlags flags;
