r300/compiler: Move declaration before code.
authorVinson Lee <vlee@vmware.com>
Wed, 29 Sep 2010 18:41:14 +0000 (11:41 -0700)
committerVinson Lee <vlee@vmware.com>
Wed, 29 Sep 2010 18:41:14 +0000 (11:41 -0700)
Fixes these GCC warnings on linux-x86 build.
radeon_pair_translate.c: In function ‘set_pair_instruction’:
radeon_pair_translate.c:153: warning: ISO C90 forbids mixed declarations and code
radeon_pair_translate.c:170: warning: ISO C90 forbids mixed declarations and code
radeon_pair_translate.c: In function ‘rc_pair_translate’:
radeon_pair_translate.c:336: warning: ISO C90 forbids mixed declarations and code
radeon_pair_translate.c:341: warning: ISO C90 forbids mixed declarations and code

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

index ff825844663177047a886b69265b78d81142d282..c549be52183891867e2153b783a78aacef853f5f 100644 (file)
@@ -148,9 +148,12 @@ static void set_pair_instruction(struct r300_fragment_program_compiler *c,
        struct rc_pair_instruction * pair,
        struct rc_sub_instruction * inst)
 {
+       int needrgb, needalpha, istranscendent;
+       const struct rc_opcode_info * opcode;
+       int i;
+
        memset(pair, 0, sizeof(struct rc_pair_instruction));
 
-       int needrgb, needalpha, istranscendent;
        classify_instruction(inst, &needrgb, &needalpha, &istranscendent);
 
        if (needrgb) {
@@ -167,8 +170,7 @@ static void set_pair_instruction(struct r300_fragment_program_compiler *c,
                        pair->Alpha.Saturate = 1;
        }
 
-       const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->Opcode);
-       int i;
+       opcode = rc_get_opcode_info(inst->Opcode);
 
        /* Presubtract handling:
         * We need to make sure that the values used by the presubtract
@@ -330,15 +332,18 @@ void rc_pair_translate(struct radeon_compiler *cc, void *user)
        for(struct rc_instruction * inst = c->Base.Program.Instructions.Next;
            inst != &c->Base.Program.Instructions;
            inst = inst->Next) {
+               const struct rc_opcode_info * opcode;
+               struct rc_sub_instruction copy;
+
                if (inst->Type != RC_INSTRUCTION_NORMAL)
                        continue;
 
-               const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode);
+               opcode = rc_get_opcode_info(inst->U.I.Opcode);
 
                if (opcode->HasTexture || opcode->IsFlowControl || opcode->Opcode == RC_OPCODE_KIL)
                        continue;
 
-               struct rc_sub_instruction copy = inst->U.I;
+               copy = inst->U.I;
 
                check_opcode_support(c, &copy);