[Mesa-dev] [PATCH 1/3] radv: remove radv_userdata_info::indirect field

[Samuel Pitoiset]

Always false.

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 src/amd/vulkan/radv_cmd_buffer.c  |  2 --
 src/amd/vulkan/radv_nir_to_llvm.c | 15 ++++++---------
 src/amd/vulkan/radv_shader.h      |  1 -
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 2b17fbb339c..aae90290841 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -589,7 +589,6 @@ radv_emit_userdata_address(struct radv_cmd_buffer 
*cmd_buffer,
                return;
 
        assert(loc->num_sgprs == 1);
-       assert(!loc->indirect);
 
        radv_emit_shader_pointer(cmd_buffer->device, cmd_buffer->cs,
                                 base_reg + loc->sgpr_idx * 4, va, false);
@@ -4158,7 +4157,6 @@ radv_emit_dispatch_packets(struct radv_cmd_buffer 
*cmd_buffer,
                }
 
                if (loc->sgpr_idx != -1) {
-                       assert(!loc->indirect);
                        assert(loc->num_sgprs == 3);
 
                        radeon_set_sh_reg_seq(cs, R_00B900_COMPUTE_USER_DATA_0 +
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c 
b/src/amd/vulkan/radv_nir_to_llvm.c
index 40812fa7ffb..86b51bbf7e2 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -553,11 +553,10 @@ create_llvm_function(LLVMContextRef ctx, LLVMModuleRef 
module,
 
 static void
 set_loc(struct radv_userdata_info *ud_info, uint8_t *sgpr_idx,
-       uint8_t num_sgprs, bool indirect)
+       uint8_t num_sgprs)
 {
        ud_info->sgpr_idx = *sgpr_idx;
        ud_info->num_sgprs = num_sgprs;
-       ud_info->indirect = indirect;
        *sgpr_idx += num_sgprs;
 }
 
@@ -569,7 +568,7 @@ set_loc_shader(struct radv_shader_context *ctx, int idx, 
uint8_t *sgpr_idx,
                &ctx->shader_info->user_sgprs_locs.shader_data[idx];
        assert(ud_info);
 
-       set_loc(ud_info, sgpr_idx, num_sgprs, false);
+       set_loc(ud_info, sgpr_idx, num_sgprs);
 }
 
 static void
@@ -581,18 +580,16 @@ set_loc_shader_ptr(struct radv_shader_context *ctx, int 
idx, uint8_t *sgpr_idx)
 }
 
 static void
-set_loc_desc(struct radv_shader_context *ctx, int idx,  uint8_t *sgpr_idx,
-            bool indirect)
+set_loc_desc(struct radv_shader_context *ctx, int idx, uint8_t *sgpr_idx)
 {
        struct radv_userdata_locations *locs =
                &ctx->shader_info->user_sgprs_locs;
        struct radv_userdata_info *ud_info = &locs->descriptor_sets[idx];
        assert(ud_info);
 
-       set_loc(ud_info, sgpr_idx, 1, indirect);
+       set_loc(ud_info, sgpr_idx, 1);
 
-       if (!indirect)
-               locs->descriptor_sets_enabled |= 1 << idx;
+       locs->descriptor_sets_enabled |= 1 << idx;
 }
 
 struct user_sgpr_info {
@@ -848,7 +845,7 @@ set_global_input_locs(struct radv_shader_context *ctx, 
gl_shader_stage stage,
                for (unsigned i = 0; i < num_sets; ++i) {
                        if ((ctx->shader_info->info.desc_set_used_mask & (1 << 
i)) &&
                            ctx->options->layout->set[i].layout->shader_stages 
& stage_mask) {
-                               set_loc_desc(ctx, i, user_sgpr_idx, false);
+                               set_loc_desc(ctx, i, user_sgpr_idx);
                        } else
                                ctx->descriptor_sets[i] = NULL;
                }
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index a1d38b3ce12..3652a811e80 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -213,7 +213,6 @@ struct radv_shader_info {
 struct radv_userdata_info {
        int8_t sgpr_idx;
        uint8_t num_sgprs;
-       bool indirect;
 };
 
 struct radv_userdata_locations {
-- 
2.20.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev