radeonsi: move si_insert_input_* functions

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3399>

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index c229eb967c8674454dd82cf15901f171c1346607..35f1c017a9fb4cd0e9384a6058f4a0447e6b8406 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2172,34 +2172,6 @@ static void si_write_tess_factors(struct si_shader_context *ctx,
        ac_build_endif(&ctx->ac, 6503);
 }
 
-LLVMValueRef si_insert_input_ret(struct si_shader_context *ctx, LLVMValueRef ret,
-                                struct ac_arg param, unsigned return_index)
-{
-       return LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                   ac_get_arg(&ctx->ac, param),
-                                   return_index, "");
-}
-
-LLVMValueRef si_insert_input_ret_float(struct si_shader_context *ctx, LLVMValueRef ret,
-                                      struct ac_arg param, unsigned return_index)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef p = ac_get_arg(&ctx->ac, param);
-
-       return LLVMBuildInsertValue(builder, ret,
-                                   ac_to_float(&ctx->ac, p),
-                                   return_index, "");
-}
-
-LLVMValueRef si_insert_input_ptr(struct si_shader_context *ctx, LLVMValueRef ret,
-                                struct ac_arg param, unsigned return_index)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef ptr = ac_get_arg(&ctx->ac, param);
-       ptr = LLVMBuildPtrToInt(builder, ptr, ctx->i32, "");
-       return LLVMBuildInsertValue(builder, ret, ptr, return_index, "");
-}
-
 /* This only writes the tessellation factor levels. */
 static void si_llvm_emit_tcs_epilogue(struct ac_shader_abi *abi,
                                      unsigned max_outputs,

diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_build.c b/src/gallium/drivers/radeonsi/si_shader_llvm_build.c
index ddf499998c096f06b9956c8448f45767597ff34c..a6522d30d7519e88092ec256ac7193de9aba3ac2 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_build.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_build.c
@@ -177,6 +177,34 @@ void si_llvm_build_ret(struct si_shader_context *ctx, LLVMValueRef ret)
                LLVMBuildRet(ctx->ac.builder, ret);
 }
 
+LLVMValueRef si_insert_input_ret(struct si_shader_context *ctx, LLVMValueRef ret,
+                                struct ac_arg param, unsigned return_index)
+{
+       return LLVMBuildInsertValue(ctx->ac.builder, ret,
+                                   ac_get_arg(&ctx->ac, param),
+                                   return_index, "");
+}
+
+LLVMValueRef si_insert_input_ret_float(struct si_shader_context *ctx, LLVMValueRef ret,
+                                      struct ac_arg param, unsigned return_index)
+{
+       LLVMBuilderRef builder = ctx->ac.builder;
+       LLVMValueRef p = ac_get_arg(&ctx->ac, param);
+
+       return LLVMBuildInsertValue(builder, ret,
+                                   ac_to_float(&ctx->ac, p),
+                                   return_index, "");
+}
+
+LLVMValueRef si_insert_input_ptr(struct si_shader_context *ctx, LLVMValueRef ret,
+                                struct ac_arg param, unsigned return_index)
+{
+       LLVMBuilderRef builder = ctx->ac.builder;
+       LLVMValueRef ptr = ac_get_arg(&ctx->ac, param);
+       ptr = LLVMBuildPtrToInt(builder, ptr, ctx->i32, "");
+       return LLVMBuildInsertValue(builder, ret, ptr, return_index, "");
+}
+
 LLVMValueRef si_prolog_get_rw_buffers(struct si_shader_context *ctx)
 {
        LLVMValueRef ptr[2], list;