Mesa (master): radeonsi: remove local variable 'mod' from si_compile_tgsi_shader

Marek Olšák mareko at kemper.freedesktop.org
Sun Apr 16 23:30:59 UTC 2017


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Mar 15 20:50:35 2017 +0100

radeonsi: remove local variable 'mod' from si_compile_tgsi_shader

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

---

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

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index b49e801101..5d7175d674 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7508,7 +7508,6 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
 {
 	struct si_shader_selector *sel = shader->selector;
 	struct si_shader_context ctx;
-	LLVMModuleRef mod;
 	int r = -1;
 
 	/* Dump TGSI code before doing TGSI->LLVM conversion in case the
@@ -7619,12 +7618,10 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
 		si_build_wrapper_function(&ctx, parts, need_prolog ? 3 : 2, need_prolog ? 1 : 0);
 	}
 
-	mod = ctx.gallivm.module;
-
 	/* Dump LLVM IR before any optimization passes */
 	if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
 	    r600_can_dump_shader(&sscreen->b, ctx.type))
-		ac_dump_module(mod);
+		LLVMDumpModule(ctx.gallivm.module);
 
 	si_llvm_finalize_module(&ctx,
 				    r600_extra_shader_checks(&sscreen->b, ctx.type));
@@ -7638,7 +7635,7 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
 
 	/* Compile to bytecode. */
 	r = si_compile_llvm(sscreen, &shader->binary, &shader->config, tm,
-			    mod, debug, ctx.type, "TGSI shader");
+			    ctx.gallivm.module, debug, ctx.type, "TGSI shader");
 	si_llvm_dispose(&ctx);
 	if (r) {
 		fprintf(stderr, "LLVM failed to compile shader\n");




More information about the mesa-commit mailing list