Module: Mesa Branch: main Commit: 37d32dcce398d3026989f9b7ac27e43a94947c36 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37d32dcce398d3026989f9b7ac27e43a94947c36
Author: Yevhenii Kolesnikov <[email protected]> Date: Tue Apr 6 15:28:28 2021 +0300 turnip: 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: Danylo Piliaiev <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13000> --- src/freedreno/vulkan/tu_device.c | 6 ++++-- src/freedreno/vulkan/tu_private.h | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index d768d3c3c38..3053d5052c2 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -1427,7 +1427,9 @@ tu_queue_init(struct tu_device *device, int idx, VkDeviceQueueCreateFlags flags) { - 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->queue_family_index = queue_family_index; @@ -1449,7 +1451,7 @@ tu_queue_init(struct tu_device *device, static void tu_queue_finish(struct tu_queue *queue) { - vk_object_base_finish(&queue->base); + vk_queue_finish(&queue->vk); if (queue->fence >= 0) close(queue->fence); tu_drm_submitqueue_close(queue->device, queue->msm_queue_id); diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index ceea037ed24..39e4a2c379a 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -93,6 +93,7 @@ typedef uint32_t xcb_window_t; #include "vk_format.h" #include "vk_command_buffer.h" +#include "vk_queue.h" #define MAX_VBS 32 #define MAX_VERTEX_ATTRIBS 32 @@ -298,7 +299,7 @@ struct tu_u_trace_syncobj; struct tu_queue { - struct vk_object_base base; + struct vk_queue vk; struct tu_device *device; uint32_t queue_family_index; @@ -1772,7 +1773,7 @@ VK_DEFINE_HANDLE_CASTS(tu_instance, vk.base, VkInstance, VK_OBJECT_TYPE_INSTANCE) VK_DEFINE_HANDLE_CASTS(tu_physical_device, vk.base, VkPhysicalDevice, VK_OBJECT_TYPE_PHYSICAL_DEVICE) -VK_DEFINE_HANDLE_CASTS(tu_queue, base, VkQueue, VK_OBJECT_TYPE_QUEUE) +VK_DEFINE_HANDLE_CASTS(tu_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEUE) VK_DEFINE_NONDISP_HANDLE_CASTS(tu_cmd_pool, base, VkCommandPool, VK_OBJECT_TYPE_COMMAND_POOL)
