From: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed, 15 Jan 2014 03:31:07 +0000 (+0900)
Subject: radeonsi: Really dump TGSI code before any TGSI->LLVM conversion attempt
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1df0d45c4dc76922b240e7b43deb0e173b78f1e;p=mesa.git

radeonsi: Really dump TGSI code before any TGSI->LLVM conversion attempt

While we're at it, use the local variable 'sel'.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 7718e919555..c9001a0ec10 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2421,7 +2421,14 @@ int si_pipe_shader_create(
 	struct lp_build_tgsi_context * bld_base;
 	LLVMModuleRef mod;
 	int r = 0;
-	bool dump = r600_can_dump_shader(&sctx->screen->b, shader->selector->tokens);
+	bool dump = r600_can_dump_shader(&sctx->screen->b, sel->tokens);
+
+	/* Dump TGSI code before doing TGSI->LLVM conversion in case the
+	 * conversion fails. */
+	if (dump) {
+		tgsi_dump(sel->tokens, 0);
+		si_dump_streamout(&sel->so);
+	}
 
 	assert(shader->shader.noutput == 0);
 	assert(shader->shader.nparam == 0);
@@ -2509,13 +2516,6 @@ int si_pipe_shader_create(
 	preload_samplers(&si_shader_ctx);
 	preload_streamout_buffers(&si_shader_ctx);
 
-	/* Dump TGSI code before doing TGSI->LLVM conversion in case the
-	 * conversion fails. */
-	if (dump) {
-		tgsi_dump(sel->tokens, 0);
-		si_dump_streamout(&sel->so);
-	}
-
 	if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
 		si_shader_ctx.gs_next_vertex =
 			lp_build_alloca(bld_base->base.gallivm,