From 0d80799ccd68a11651e51aeb6f2493461ceb7d68 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 28 Sep 2021 10:11:42 -0500 Subject: [PATCH] panvk: Drop panvk_queue::flags/queue_family_index Reviewed-by: Boris Brezillon Tested-by: Boris Brezillon Part-of: --- src/panfrost/vulkan/panvk_device.c | 4 +--- src/panfrost/vulkan/panvk_private.h | 2 -- src/panfrost/vulkan/panvk_wsi.c | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 1488bab40dc..0ff4ac4bb72 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -917,8 +917,6 @@ panvk_queue_init(struct panvk_device *device, if (result != VK_SUCCESS) return result; queue->device = device; - queue->queue_family_index = create_info->queueFamilyIndex; - queue->flags = create_info->flags; struct drm_syncobj_create create = { .flags = DRM_SYNCOBJ_CREATE_SIGNALED, @@ -1081,7 +1079,7 @@ panvk_GetDeviceQueue2(VkDevice _device, struct panvk_queue *queue; queue = &device->queues[pQueueInfo->queueFamilyIndex][pQueueInfo->queueIndex]; - if (pQueueInfo->flags != queue->flags) { + if (pQueueInfo->flags != queue->vk.flags) { /* From the Vulkan 1.1.70 spec: * * "The queue returned by vkGetDeviceQueue2 must have the same diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index 3d91b2eb9b7..bf95df07136 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -251,8 +251,6 @@ struct panvk_pipeline_cache { struct panvk_queue { struct vk_queue vk; struct panvk_device *device; - uint32_t queue_family_index; - VkDeviceQueueCreateFlags flags; uint32_t sync; }; diff --git a/src/panfrost/vulkan/panvk_wsi.c b/src/panfrost/vulkan/panvk_wsi.c index d4420aee89a..84324975f72 100644 --- a/src/panfrost/vulkan/panvk_wsi.c +++ b/src/panfrost/vulkan/panvk_wsi.c @@ -254,8 +254,8 @@ panvk_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) VK_FROM_HANDLE(panvk_queue, queue, _queue); return wsi_common_queue_present( &queue->device->physical_device->wsi_device, - panvk_device_to_handle(queue->device), _queue, queue->queue_family_index, - pPresentInfo); + panvk_device_to_handle(queue->device), _queue, + queue->vk.queue_family_index, pPresentInfo); } VkResult