Mesa (master): r600g: Move declaration before code in r600_asm.c.

Vinson Lee vlee at kemper.freedesktop.org
Thu Jan 13 22:17:36 UTC 2011


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Jan 13 14:17:01 2011 -0800

r600g: Move declaration before code in r600_asm.c.

Fixes SCons build.

---

 src/gallium/drivers/r600/r600_asm.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index e96236e..52dc068 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -700,6 +700,8 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5], s
 		return r;
 
 	for (i = 0; i < 5; ++i) {
+		struct r600_bc_alu *alu;
+
 		/* check number of literals */
 		if (prev[i] && r600_bc_alu_nliterals(prev[i], literal, &nliteral))
 			return 0;
@@ -730,7 +732,7 @@ static int merge_inst_groups(struct r600_bc *bc, struct r600_bc_alu *slots[5], s
 			result[i] = slots[i];
 
 		// let's check source gprs
-		struct r600_bc_alu *alu = slots[i];
+		alu = slots[i];
 		num_once_inst += is_alu_once_inst(alu);
 
 		num_src = r600_bc_get_num_operands(alu);




More information about the mesa-commit mailing list