Mesa (main): radv: remove unnecessary radv_shader_info:base_inline_push_consts

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Oct  1 15:29:19 2021 +0200

radv: remove unnecessary radv_shader_info:base_inline_push_consts

No need to duplicate it.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13149>

---

 src/amd/compiler/aco_instruction_selection.cpp | 2 +-
 src/amd/vulkan/radv_cmd_buffer.c               | 2 +-
 src/amd/vulkan/radv_shader.h                   | 1 -
 src/amd/vulkan/radv_shader_args.c              | 4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index f38344249f3..17ae895452d 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -5491,7 +5491,7 @@ visit_load_push_constant(isel_context* ctx, nir_intrinsic_instr* instr)
 
    if (index_cv && instr->dest.ssa.bit_size == 32) {
       unsigned start = (offset + index_cv->u32) / 4u;
-      start -= ctx->args->ac.base_inline_push_consts;
+      start -= ctx->args->shader_info->min_push_constant_used / 4;
       if (start + count <= ctx->args->ac.num_inline_push_consts) {
          std::array<Temp, NIR_MAX_VEC_COMPONENTS> elems;
          aco_ptr<Pseudo_instruction> vec{create_instruction<Pseudo_instruction>(
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index b864d08a32d..ab6b32f873b 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2885,7 +2885,7 @@ radv_flush_constants(struct radv_cmd_buffer *cmd_buffer, VkShaderStageFlags stag
 
       need_push_constants |= radv_shader_loads_push_constants(pipeline, stage);
 
-      uint8_t base = shader->info.base_inline_push_consts;
+      uint8_t base = shader->info.min_push_constant_used / 4;
       uint8_t count = shader->info.num_inline_push_consts;
 
       radv_emit_inline_push_consts(cmd_buffer, pipeline, stage, AC_UD_INLINE_PUSH_CONSTANTS, count,
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index f6c2f8129e2..9c4d405fe6d 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -220,7 +220,6 @@ struct radv_shader_info {
    bool has_only_32bit_push_constants;
    bool has_indirect_push_constants;
    uint8_t num_inline_push_consts;
-   uint8_t base_inline_push_consts;
    uint32_t desc_set_used_mask;
    bool needs_multiview_view_index;
    bool uses_invocation_id;
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index 8017787deb8..5e8ad656bb4 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -168,8 +168,6 @@ allocate_inline_push_consts(struct radv_shader_args *args, struct user_sgpr_info
        */
       args->shader_info->loads_push_constants = false;
    }
-
-   args->shader_info->base_inline_push_consts = args->shader_info->min_push_constant_used / 4;
 }
 
 static void
@@ -271,7 +269,7 @@ declare_global_input_sgprs(struct radv_shader_args *args,
       ac_add_arg(&args->ac, AC_ARG_SGPR, 1, AC_ARG_INT, &args->ac.inline_push_consts[i]);
    }
    args->ac.num_inline_push_consts = args->shader_info->num_inline_push_consts;
-   args->ac.base_inline_push_consts = args->shader_info->base_inline_push_consts;
+   args->ac.base_inline_push_consts = args->shader_info->min_push_constant_used / 4;
 
    if (args->shader_info->so.num_outputs) {
       ac_add_arg(&args->ac, AC_ARG_SGPR, 1, AC_ARG_CONST_DESC_PTR, &args->streamout_buffers);