commit f2fdd14907a6481e93e81cd4ca8921b8690ae893
author José Roberto de Souza <jose.souza@intel.com> Mon Jan 23 11:03:55 2023 -0800
committer Marge Bot <emma+marge@anholt.net> Wed Jan 25 17:43:57 2023 +0000
tree 7c8d7a7c5c2ed531cb3f8ea63073d092cbc2e37a
parent 013e849a2c6f78dfe8384ae1ba5325ff8d13a256

hasvk: Nuke anv_queue:index_in_family

This value is also stored in vk_queue, so we can nuke from anv_queue.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20888>

src/intel/vulkan_hasvk/anv_private.h

diff --git a/src/intel/vulkan_hasvk/anv_private.h b/src/intel/vulkan_hasvk/anv_private.h
index e534402..ca5cb5d 100644
--- a/src/intel/vulkan_hasvk/anv_private.h
+++ b/src/intel/vulkan_hasvk/anv_private.h
@@ -967,8 +967,6 @@
 
    const struct anv_queue_family *           family;
 
-   uint32_t                                  index_in_family;
-
    uint32_t                                  exec_flags;
 
    /** Synchronization object for debug purposes (DEBUG_SYNC) */

src/intel/vulkan_hasvk/anv_queue.c

diff --git a/src/intel/vulkan_hasvk/anv_queue.c b/src/intel/vulkan_hasvk/anv_queue.c
index 2cada84..d399943 100644
--- a/src/intel/vulkan_hasvk/anv_queue.c
+++ b/src/intel/vulkan_hasvk/anv_queue.c
@@ -57,9 +57,6 @@
 
    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;

src/intel/vulkan_hasvk/anv_utrace.c

diff --git a/src/intel/vulkan_hasvk/anv_utrace.c b/src/intel/vulkan_hasvk/anv_utrace.c
index d74d6f6..ad3d9a7 100644
--- a/src/intel/vulkan_hasvk/anv_utrace.c
+++ b/src/intel/vulkan_hasvk/anv_utrace.c
@@ -287,7 +287,7 @@
       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);
    }
 }