r300/compiler: Move declaration before code.
authorVinson Lee <vlee@vmware.com>
Fri, 5 Nov 2010 00:18:46 +0000 (17:18 -0700)
committerVinson Lee <vlee@vmware.com>
Fri, 5 Nov 2010 00:18:46 +0000 (17:18 -0700)
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

src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c

index d4a3860..553e9dc 100644 (file)
@@ -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;