Mesa (master): radeonsi: minor cleanup in si_shader_internal.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1c73d598eb7b8cba6a51f19747e1fe4b9a9a066b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c73d598eb7b8cba6a51f19747e1fe4b9a9a066b

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jan 15 18:08:54 2020 -0500

radeonsi: minor cleanup in si_shader_internal.h

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

---

 src/gallium/drivers/radeonsi/si_shader_internal.h  | 14 +------------
 src/gallium/drivers/radeonsi/si_shader_llvm_tess.c | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index af88bad47ed..d9b84ab1302 100644
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -196,20 +196,7 @@ si_shader_context_from_abi(struct ac_shader_abi *abi)
 	return container_of(abi, ctx, abi);
 }
 
-LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
-				   LLVMTypeRef type,
-				   LLVMValueRef vertex_index,
-				   LLVMValueRef param_index,
-				   unsigned const_index,
-				   unsigned location,
-				   unsigned driver_location,
-				   unsigned component,
-				   unsigned num_components,
-				   bool is_patch,
-				   bool is_compact,
-				   bool load_input);
 bool si_is_merged_shader(struct si_shader_context *ctx);
-LLVMValueRef si_get_sample_id(struct si_shader_context *ctx);
 void si_declare_compute_memory(struct si_shader_context *ctx);
 LLVMValueRef si_get_primitive_id(struct si_shader_context *ctx,
 				 unsigned swizzle);
@@ -311,6 +298,7 @@ void si_llvm_init_tcs_callbacks(struct si_shader_context *ctx);
 void si_llvm_init_tes_callbacks(struct si_shader_context *ctx, bool ngg_cull_shader);
 
 /* si_shader_llvm_ps.c */
+LLVMValueRef si_get_sample_id(struct si_shader_context *ctx);
 void si_llvm_build_ps_prolog(struct si_shader_context *ctx,
 			     union si_shader_part_key *key);
 void si_llvm_build_ps_epilog(struct si_shader_context *ctx,
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
index a9f6e76f1f0..116e06e5af1 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
@@ -499,18 +499,18 @@ static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi,
 	return ac_build_varying_gather_values(&ctx->ac, value, num_components, component);
 }
 
-LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
-				   LLVMTypeRef type,
-				   LLVMValueRef vertex_index,
-				   LLVMValueRef param_index,
-				   unsigned const_index,
-				   unsigned location,
-				   unsigned driver_location,
-				   unsigned component,
-				   unsigned num_components,
-				   bool is_patch,
-				   bool is_compact,
-				   bool load_input)
+static LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
+					  LLVMTypeRef type,
+					  LLVMValueRef vertex_index,
+					  LLVMValueRef param_index,
+					  unsigned const_index,
+					  unsigned location,
+					  unsigned driver_location,
+					  unsigned component,
+					  unsigned num_components,
+					  bool is_patch,
+					  bool is_compact,
+					  bool load_input)
 {
 	struct si_shader_context *ctx = si_shader_context_from_abi(abi);
 	struct si_shader_info *info = &ctx->shader->selector->info;