summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-11-04 17:18:46 -0700
committerVinson Lee <vlee@vmware.com>2010-11-04 17:18:46 -0700
commit86559ce2d84456674e617be97da238bfb7cc4daf (patch)
tree5cd6d7bca77e16e2ba74fe950585fee50e801b8f
parent7831994868d039da726cc0c1a86b1f94137ad412 (diff)
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
-rw-r--r--src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c5
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 d4a38607d9..553e9dcf7c 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;