Mesa (main): anv: drop unused argument of anv_descriptor_set_address

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 30 08:52:11 UTC 2021


Module: Mesa
Branch: main
Commit: 7048a15485cbd3f26b04ed829f458ac78916c159
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7048a15485cbd3f26b04ed829f458ac78916c159

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Mon Jun 28 17:14:08 2021 +0200

anv: drop unused argument of anv_descriptor_set_address

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11577>

---

 src/intel/vulkan/anv_cmd_buffer.c  | 2 +-
 src/intel/vulkan/anv_private.h     | 3 +--
 src/intel/vulkan/genX_cmd_buffer.c | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index df183507d2e..5b1a354a7f8 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -946,7 +946,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
       if (bind_point == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR) {
          struct anv_push_constants *push = &pipe_state->push_constants;
 
-         struct anv_address addr = anv_descriptor_set_address(cmd_buffer, set);
+         struct anv_address addr = anv_descriptor_set_address(set);
          push->desc_sets[set_index] = anv_address_physical(addr);
 
          if (addr.bo) {
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index e2dba5ed098..423d178d35f 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2097,8 +2097,7 @@ struct anv_push_descriptor_set {
 };
 
 static inline struct anv_address
-anv_descriptor_set_address(struct anv_cmd_buffer *cmd_buffer,
-                           struct anv_descriptor_set *set)
+anv_descriptor_set_address(struct anv_descriptor_set *set)
 {
    if (anv_descriptor_set_is_push(set)) {
       /* We have to flag push descriptor set as used on the GPU
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 4f428f2e5e2..4f39e01ad3f 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -2673,7 +2673,7 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
          assert(set->desc_surface_state.alloc_size);
          bt_map[s] = set->desc_surface_state.offset + state_offset;
          add_surface_reloc(cmd_buffer, set->desc_surface_state,
-                           anv_descriptor_set_address(cmd_buffer, set));
+                           anv_descriptor_set_address(set));
          break;
       }
 
@@ -3036,7 +3036,7 @@ get_push_range_address(struct anv_cmd_buffer *cmd_buffer,
        */
       struct anv_descriptor_set *set =
          gfx_state->base.descriptors[range->index];
-      return anv_descriptor_set_address(cmd_buffer, set);
+      return anv_descriptor_set_address(set);
    }
 
    case ANV_DESCRIPTOR_SET_PUSH_CONSTANTS: {



More information about the mesa-commit mailing list