[Mesa-dev] [PATCH 2/2] radeonsi: rename si_eliminate_const_vs_outputs -> si_optimize_vs_outputs

Marek Olšák maraeo at gmail.com
Mon May 8 16:38:53 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_shader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 1be6654..e89b325 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7239,21 +7239,21 @@ static void si_init_shader_ctx(struct si_shader_context *ctx,
 	bld_base->op_actions[TGSI_OPCODE_READ_FIRST].emit = read_lane_emit;
 	bld_base->op_actions[TGSI_OPCODE_READ_INVOC].intr_name = "llvm.amdgcn.readlane";
 	bld_base->op_actions[TGSI_OPCODE_READ_INVOC].fetch_args = read_invoc_fetch_args;
 	bld_base->op_actions[TGSI_OPCODE_READ_INVOC].emit = read_lane_emit;
 
 	bld_base->op_actions[TGSI_OPCODE_EMIT].emit = si_llvm_emit_vertex;
 	bld_base->op_actions[TGSI_OPCODE_ENDPRIM].emit = si_llvm_emit_primitive;
 	bld_base->op_actions[TGSI_OPCODE_BARRIER].emit = si_llvm_emit_barrier;
 }
 
-static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
+static void si_optimize_vs_outputs(struct si_shader_context *ctx)
 {
 	struct si_shader *shader = ctx->shader;
 	struct tgsi_shader_info *info = &shader->selector->info;
 
 	if ((ctx->type != PIPE_SHADER_VERTEX &&
 	     ctx->type != PIPE_SHADER_TESS_EVAL) ||
 	    shader->key.as_ls ||
 	    shader->key.as_es)
 		return;
 
@@ -8162,21 +8162,21 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
 		si_build_ps_epilog_function(&ctx, &epilog_key);
 		parts[need_prolog ? 2 : 1] = ctx.main_fn;
 
 		si_build_wrapper_function(&ctx, parts, need_prolog ? 3 : 2,
 					  need_prolog ? 1 : 0, 0);
 	}
 
 	si_llvm_optimize_module(&ctx);
 
 	/* Post-optimization transformations and analysis. */
-	si_eliminate_const_vs_outputs(&ctx);
+	si_optimize_vs_outputs(&ctx);
 
 	if ((debug && debug->debug_message) ||
 	    r600_can_dump_shader(&sscreen->b, ctx.type))
 		si_count_scratch_private_memory(&ctx);
 
 	/* Compile to bytecode. */
 	r = si_compile_llvm(sscreen, &shader->binary, &shader->config, tm,
 			    ctx.gallivm.module, debug, ctx.type, "TGSI shader");
 	si_llvm_dispose(&ctx);
 	if (r) {
-- 
2.7.4



More information about the mesa-dev mailing list