From f2fdd14907a6481e93e81cd4ca8921b8690ae893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Mon, 23 Jan 2023 11:03:55 -0800 Subject: [PATCH] hasvk: Nuke anv_queue:index_in_family MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This value is also stored in vk_queue, so we can nuke from anv_queue. Signed-off-by: José Roberto de Souza Reviewed-by: Marcin Ślusarz Part-of: --- src/intel/vulkan_hasvk/anv_private.h | 2 -- src/intel/vulkan_hasvk/anv_queue.c | 3 --- src/intel/vulkan_hasvk/anv_utrace.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_private.h b/src/intel/vulkan_hasvk/anv_private.h index e53440253c8..ca5cb5dd2aa 100644 --- a/src/intel/vulkan_hasvk/anv_private.h +++ b/src/intel/vulkan_hasvk/anv_private.h @@ -967,8 +967,6 @@ struct anv_queue { const struct anv_queue_family * family; - uint32_t index_in_family; - uint32_t exec_flags; /** Synchronization object for debug purposes (DEBUG_SYNC) */ diff --git a/src/intel/vulkan_hasvk/anv_queue.c b/src/intel/vulkan_hasvk/anv_queue.c index 2cada846753..d3999434422 100644 --- a/src/intel/vulkan_hasvk/anv_queue.c +++ b/src/intel/vulkan_hasvk/anv_queue.c @@ -57,9 +57,6 @@ anv_queue_init(struct anv_device *device, struct anv_queue *queue, assert(queue->vk.queue_family_index < pdevice->queue.family_count); queue->family = &pdevice->queue.families[queue->vk.queue_family_index]; - - queue->index_in_family = index_in_family; - queue->exec_flags = exec_flags; return VK_SUCCESS; diff --git a/src/intel/vulkan_hasvk/anv_utrace.c b/src/intel/vulkan_hasvk/anv_utrace.c index d74d6f6daee..ad3d9a77fcc 100644 --- a/src/intel/vulkan_hasvk/anv_utrace.c +++ b/src/intel/vulkan_hasvk/anv_utrace.c @@ -287,7 +287,7 @@ anv_device_utrace_init(struct anv_device *device) queue->ds = intel_ds_device_add_queue(&device->ds, "%s%u", intel_engines_class_to_string(queue->family->engine_class), - queue->index_in_family); + queue->vk.index_in_family); } }