Mesa (master): r300/compiler: Move declaration before code.

Vinson Lee vlee at kemper.freedesktop.org
Fri Nov 5 00:19:45 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Nov  4 17:18:46 2010 -0700

r300/compiler: Move declaration before code.

Fixes this GCC warning with linux-x86 build.
radeon_pair_schedule.c: In function 'merge_presub_sources':
radeon_pair_schedule.c:312: warning: ISO C90 forbids mixed declarations and code

---

 .../dri/r300/compiler/radeon_pair_schedule.c       |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
index d4a3860..553e9dc 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -290,6 +290,7 @@ static int merge_presub_sources(
 {
 	unsigned int srcp_src, srcp_regs, is_rgb, is_alpha;
 	struct rc_pair_sub_instruction * dst_sub;
+	const struct rc_opcode_info * info;
 
 	assert(dst_full->Alpha.Opcode == RC_OPCODE_NOP);
 
@@ -309,8 +310,8 @@ static int merge_presub_sources(
 		return 0;
 	}
 
-	const struct rc_opcode_info * info =
-					rc_get_opcode_info(dst_full->RGB.Opcode);
+	info = rc_get_opcode_info(dst_full->RGB.Opcode);
+
 	if (dst_sub->Src[RC_PAIR_PRESUB_SRC].Used)
 		return 0;
 




More information about the mesa-commit mailing list