radeonsi: make get_bounded_indirect_index externally accessible

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 39ce0804e49874b26d224a22dd49e597e59e660f..1001b279527c77220e0f419929587ed185a14f72 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -594,9 +594,9 @@ static LLVMValueRef get_indirect_index(struct si_shader_context *ctx,
  * Like get_indirect_index, but restricts the return value to a (possibly
  * undefined) value inside [0..num).
  */
-static LLVMValueRef get_bounded_indirect_index(struct si_shader_context *ctx,
-                                              const struct tgsi_ind_register *ind,
-                                              int rel_index, unsigned num)
+LLVMValueRef si_get_bounded_indirect_index(struct si_shader_context *ctx,
+                                          const struct tgsi_ind_register *ind,
+                                          int rel_index, unsigned num)
 {
        LLVMValueRef result = get_indirect_index(ctx, ind, rel_index);
 
@@ -1761,9 +1761,9 @@ static LLVMValueRef fetch_constant(
        if (reg->Register.Dimension && reg->Dimension.Indirect) {
                LLVMValueRef ptr = LLVMGetParam(ctx->main_fn, ctx->param_const_buffers);
                LLVMValueRef index;
-               index = get_bounded_indirect_index(ctx, &reg->DimIndirect,
-                                                  reg->Dimension.Index,
-                                                  SI_NUM_CONST_BUFFERS);
+               index = si_get_bounded_indirect_index(ctx, &reg->DimIndirect,
+                                                     reg->Dimension.Index,
+                                                     SI_NUM_CONST_BUFFERS);
                bufp = ac_build_indexed_load_const(&ctx->ac, ptr, index);
        } else
                bufp = load_const_buffer_desc(ctx, buf);
@@ -3473,9 +3473,9 @@ shader_buffer_fetch_rsrc(struct si_shader_context *ctx,
        if (!reg->Register.Indirect)
                index = LLVMConstInt(ctx->i32, reg->Register.Index, 0);
        else
-               index = get_bounded_indirect_index(ctx, &reg->Indirect,
-                                                  reg->Register.Index,
-                                                  SI_NUM_SHADER_BUFFERS);
+               index = si_get_bounded_indirect_index(ctx, &reg->Indirect,
+                                                     reg->Register.Index,
+                                                     SI_NUM_SHADER_BUFFERS);
 
        return ac_build_indexed_load_const(&ctx->ac, rsrc_ptr, index);
 }
@@ -3590,9 +3590,9 @@ image_fetch_rsrc(
                 *    array, the results of the operation are undefined but may
                 *    not lead to termination.
                 */
-               index = get_bounded_indirect_index(ctx, &image->Indirect,
-                                                  image->Register.Index,
-                                                  SI_NUM_IMAGES);
+               index = si_get_bounded_indirect_index(ctx, &image->Indirect,
+                                                     image->Register.Index,
+                                                     SI_NUM_IMAGES);
        }
 
        *rsrc = load_image_desc(ctx, rsrc_ptr, index, target);
@@ -4586,10 +4586,10 @@ static void tex_fetch_ptrs(
        reg = &emit_data->inst->Src[sampler_src];
 
        if (reg->Register.Indirect) {
-               index = get_bounded_indirect_index(ctx,
-                                                  &reg->Indirect,
-                                                  reg->Register.Index,
-                                                  SI_NUM_SAMPLERS);
+               index = si_get_bounded_indirect_index(ctx,
+                                                     &reg->Indirect,
+                                                     reg->Register.Index,
+                                                     SI_NUM_SAMPLERS);
        } else {
                index = LLVMConstInt(ctx->i32, reg->Register.Index, 0);
        }

diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index c3913dead3e433f3a4aa6b383d562eb68ed3c0d2..70004fae68196dd9bc7a0fd4117ed0cd1fe39f30 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -294,6 +294,10 @@ void si_llvm_emit_store(struct lp_build_tgsi_context *bld_base,
 
 void si_emit_waitcnt(struct si_shader_context *ctx, unsigned simm16);
 
+LLVMValueRef si_get_bounded_indirect_index(struct si_shader_context *ctx,
+                                          const struct tgsi_ind_register *ind,
+                                          int rel_index, unsigned num);
+
 void si_shader_context_init_alu(struct lp_build_tgsi_context *bld_base);
 
 #endif