v3dv/descriptor: remove v3dv_descriptor_map_get_image_view

Now that we added support for texel_buffers, on all the cases that we
were checking for a image_view we end checking for a image_view or
buffer_view, so we stopped to use it. Remove it as it become
superfluous.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

diff --git a/src/broadcom/vulkan/v3dv_descriptor_set.c b/src/broadcom/vulkan/v3dv_descriptor_set.c
index d00c9db..41754bd 100644 (file)
--- a/src/broadcom/vulkan/v3dv_descriptor_set.c
+++ b/src/broadcom/vulkan/v3dv_descriptor_set.c
@@ -322,30 +322,6 @@ v3dv_descriptor_map_get_texture_shader_state(struct v3dv_descriptor_state *descr
    return reloc;
 }
 
-struct v3dv_image_view *
-v3dv_descriptor_map_get_image_view(struct v3dv_descriptor_state *descriptor_state,
-                                   struct v3dv_descriptor_map *map,
-                                   struct v3dv_pipeline_layout *pipeline_layout,
-                                   uint32_t index)
-{
-   struct v3dv_descriptor *image_descriptor =
-      v3dv_descriptor_map_get_descriptor(descriptor_state,
-                                         map,
-                                         pipeline_layout,
-                                         index, NULL);
-
-   assert(image_descriptor);
-   assert(image_descriptor->type == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE ||
-          image_descriptor->type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER ||
-          image_descriptor->type == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT ||
-          image_descriptor->type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE);
-
-   assert(image_descriptor->image_view);
-   assert(image_descriptor->image_view->image);
-
-   return image_descriptor->image_view;
-}
-
 /*
  * As anv and tu already points:
  *

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 1066b92..ce1d47d 100644 (file)
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -1792,12 +1792,6 @@ v3dv_descriptor_map_get_sampler_state(struct v3dv_descriptor_state *descriptor_s
                                       struct v3dv_pipeline_layout *pipeline_layout,
                                       uint32_t index);
 
-struct v3dv_image_view *
-v3dv_descriptor_map_get_image_view(struct v3dv_descriptor_state *descriptor_state,
-                                   struct v3dv_descriptor_map *map,
-                                   struct v3dv_pipeline_layout *pipeline_layout,
-                                   uint32_t index);
-
 struct v3dv_cl_reloc
 v3dv_descriptor_map_get_texture_shader_state(struct v3dv_descriptor_state *descriptor_state,
                                              struct v3dv_descriptor_map *map,