Module: Mesa Branch: main Commit: 8619c6df62a6b3806fa8d028f17d781c549d37a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8619c6df62a6b3806fa8d028f17d781c549d37a1
Author: Jason Ekstrand <[email protected]> Date: Thu Sep 23 11:39:53 2021 -0500 turnip: Drop tu_queue::flags/queue_family_index/queue_idx They're now part of vk_queue. Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13003> --- src/freedreno/vulkan/tu_device.c | 5 +---- src/freedreno/vulkan/tu_private.h | 3 --- src/freedreno/vulkan/tu_wsi.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index ba6b65f9f84..db62eb26f3b 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -1177,9 +1177,6 @@ tu_queue_init(struct tu_device *device, return result; queue->device = device; - queue->queue_family_index = create_info->queueFamilyIndex; - queue->queue_idx = idx; - queue->flags = create_info->flags; list_inithead(&queue->queued_submits); @@ -1771,7 +1768,7 @@ tu_GetDeviceQueue2(VkDevice _device, 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/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 39e4a2c379a..44694ff5850 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -302,9 +302,6 @@ struct tu_queue struct vk_queue vk; struct tu_device *device; - uint32_t queue_family_index; - int queue_idx; - VkDeviceQueueCreateFlags flags; uint32_t msm_queue_id; int fence; diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c index 0ca26a9107e..54c0495f029 100644 --- a/src/freedreno/vulkan/tu_wsi.c +++ b/src/freedreno/vulkan/tu_wsi.c @@ -252,7 +252,7 @@ tu_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) return wsi_common_queue_present( &queue->device->physical_device->wsi_device, - tu_device_to_handle(queue->device), _queue, queue->queue_family_index, + tu_device_to_handle(queue->device), _queue, queue->vk.queue_family_index, pPresentInfo); }
