Mesa (master): r600g: Move declaration before code.

Vinson Lee vlee at kemper.freedesktop.org
Tue Jul 27 22:34:24 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Tue Jul 27 15:33:45 2010 -0700

r600g: Move declaration before code.

Fixes SCons build.

---

 src/gallium/drivers/r600/r600_shader.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index dcedf56..17e9c14 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -651,6 +651,9 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
 
 	if (inst->Dst[0].Register.WriteMask & (1 << 2))
 	{
+		int chan;
+		int sel;
+
 		/* dst.z = log(src.y) */
 		memset(&alu, 0, sizeof(struct r600_bc_alu));
 		alu.inst = V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_LOG_CLAMPED;
@@ -665,8 +668,8 @@ static int tgsi_lit(struct r600_shader_ctx *ctx)
 		if (r)
 			return r;
 
-		int chan = alu.dst.chan;
-		int sel = alu.dst.sel;
+		chan = alu.dst.chan;
+		sel = alu.dst.sel;
 
 		/* tmp.x = amd MUL_LIT(src.w, dst.z, src.x ) */
 		memset(&alu, 0, sizeof(struct r600_bc_alu));




More information about the mesa-commit mailing list