Mesa (master): ac: rename ac_eliminate_const_vs_outputs -> ac_optimize_vs_outputs

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Apr 29 23:53:08 2017 +0200

ac: rename ac_eliminate_const_vs_outputs -> ac_optimize_vs_outputs

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/amd/common/ac_llvm_build.c           | 10 +++++-----
 src/amd/common/ac_llvm_build.h           | 10 +++++-----
 src/amd/common/ac_nir_to_llvm.c          | 10 +++++-----
 src/gallium/drivers/radeonsi/si_shader.c | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index 5b42e47fa0..26ade11117 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -1320,11 +1320,11 @@ static bool ac_eliminate_const_output(uint8_t *vs_output_param_offset,
 	return true;
 }
 
-void ac_eliminate_const_vs_outputs(struct ac_llvm_context *ctx,
-				   LLVMValueRef main_fn,
-				   uint8_t *vs_output_param_offset,
-				   uint32_t num_outputs,
-				   uint8_t *num_param_exports)
+void ac_optimize_vs_outputs(struct ac_llvm_context *ctx,
+			    LLVMValueRef main_fn,
+			    uint8_t *vs_output_param_offset,
+			    uint32_t num_outputs,
+			    uint8_t *num_param_exports)
 {
 	LLVMBasicBlockRef bb;
 	bool removed_any = false;
diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index 1c3610a5e6..0ecbc4a0a2 100644
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -240,11 +240,11 @@ void ac_get_image_intr_name(const char *base_name,
 			    LLVMTypeRef rsrc_type,
 			    char *out_name, unsigned out_len);
 
-void ac_eliminate_const_vs_outputs(struct ac_llvm_context *ac,
-				   LLVMValueRef main_fn,
-				   uint8_t *vs_output_param_offset,
-				   uint32_t num_outputs,
-				   uint8_t *num_param_exports);
+void ac_optimize_vs_outputs(struct ac_llvm_context *ac,
+			    LLVMValueRef main_fn,
+			    uint8_t *vs_output_param_offset,
+			    uint32_t num_outputs,
+			    uint8_t *num_param_exports);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index fccac1a321..535b152336 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -5815,11 +5815,11 @@ ac_nir_eliminate_const_vs_outputs(struct nir_to_llvm_context *ctx)
 		outinfo = &ctx->shader_info->tes.outinfo;
 	}
 
-	ac_eliminate_const_vs_outputs(&ctx->ac,
-				      ctx->main_function,
-				      outinfo->vs_output_param_offset,
-				      VARYING_SLOT_MAX,
-				      &outinfo->param_exports);
+	ac_optimize_vs_outputs(&ctx->ac,
+			       ctx->main_function,
+			       outinfo->vs_output_param_offset,
+			       VARYING_SLOT_MAX,
+			       &outinfo->param_exports);
 }
 
 static void
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 77dd6b1a3a..7f771408a3 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7244,11 +7244,11 @@ static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
 	    shader->key.as_ls)
 		return;
 
-	ac_eliminate_const_vs_outputs(&ctx->ac,
-				      ctx->main_fn,
-				      shader->info.vs_output_param_offset,
-				      info->num_outputs,
-				      &shader->info.nr_param_exports);
+	ac_optimize_vs_outputs(&ctx->ac,
+			       ctx->main_fn,
+			       shader->info.vs_output_param_offset,
+			       info->num_outputs,
+			       &shader->info.nr_param_exports);
 }
 
 static void si_count_scratch_private_memory(struct si_shader_context *ctx)