turnip: Drop tu_queue::flags/queue_family_index/queue_idx

They're now part of vk_queue.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13003>
This commit is contained in:
Jason Ekstrand 2021-09-23 11:39:53 -05:00 committed by Marge Bot
parent 6c8b0b35a6
commit 8619c6df62
3 changed files with 2 additions and 8 deletions

View file

@ -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

View file

@ -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;

View file

@ -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);
}