r300/compiler: Move declaration before code.

Fixes these GCC warnings on linux-x86 build.
radeon_program_alu.c: In function ‘r300_transform_trig_simple’:
radeon_program_alu.c:882: warning: ISO C90 forbids mixed declarations and code
radeon_program_alu.c:932: warning: ISO C90 forbids mixed declarations and code
radeon_program_alu.c: In function ‘radeonTransformTrigScale’:
radeon_program_alu.c:996: warning: ISO C90 forbids mixed declarations and code
radeon_program_alu.c: In function ‘r300_transform_trig_scale_vertex’:
radeon_program_alu.c:1033: warning: ISO C90 forbids mixed declarations and code

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
index 4d3e26f28cd21db174a6cc0bea1833786019c24b..39408845d5ad80f69d3efe0ae9d4b2bac4beb3df 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
@@ -874,13 +874,15 @@ int r300_transform_trig_simple(struct radeon_compiler* c,
        struct rc_instruction* inst,
        void* unused)
 {
+       unsigned int constants[2];
+       unsigned int tempreg;
+
        if (inst->U.I.Opcode != RC_OPCODE_COS &&
            inst->U.I.Opcode != RC_OPCODE_SIN &&
            inst->U.I.Opcode != RC_OPCODE_SCS)
                return 0;
 
-       unsigned int constants[2];
-       unsigned int tempreg = rc_find_free_temporary(c);
+       tempreg = rc_find_free_temporary(c);
 
        sincos_constants(c, constants);
 
@@ -918,6 +920,8 @@ int r300_transform_trig_simple(struct radeon_compiler* c,
                        swizzle_wwww(srcreg(RC_FILE_TEMPORARY, tempreg)),
                        constants);
        } else {
+               struct rc_dst_register dst;
+
                emit3(c, inst->Prev, RC_OPCODE_MAD, 0, dstregtmpmask(tempreg, RC_MASK_XY),
                        swizzle_xxxx(inst->U.I.SrcReg[0]),
                        swizzle_zzzz(srcreg(RC_FILE_CONSTANT, constants[1])),
@@ -929,7 +933,7 @@ int r300_transform_trig_simple(struct radeon_compiler* c,
                        swizzle_wwww(srcreg(RC_FILE_CONSTANT, constants[1])),
                        negate(swizzle_zzzz(srcreg(RC_FILE_CONSTANT, constants[0]))));
 
-               struct rc_dst_register dst = inst->U.I.DstReg;
+               dst = inst->U.I.DstReg;
 
                dst.WriteMask = inst->U.I.DstReg.WriteMask & RC_MASK_X;
                sin_approx(c, inst, dst,
@@ -988,16 +992,16 @@ int radeonTransformTrigScale(struct radeon_compiler* c,
        struct rc_instruction* inst,
        void* unused)
 {
-       if (inst->U.I.Opcode != RC_OPCODE_COS &&
-           inst->U.I.Opcode != RC_OPCODE_SIN &&
-           inst->U.I.Opcode != RC_OPCODE_SCS)
-               return 0;
-
        static const float RCP_2PI = 0.15915494309189535;
        unsigned int temp;
        unsigned int constant;
        unsigned int constant_swizzle;
 
+       if (inst->U.I.Opcode != RC_OPCODE_COS &&
+           inst->U.I.Opcode != RC_OPCODE_SIN &&
+           inst->U.I.Opcode != RC_OPCODE_SCS)
+               return 0;
+
        temp = rc_find_free_temporary(c);
        constant = rc_constants_add_immediate_scalar(&c->Program.Constants, RCP_2PI, &constant_swizzle);
 
@@ -1020,6 +1024,10 @@ int r300_transform_trig_scale_vertex(struct radeon_compiler *c,
        struct rc_instruction *inst,
        void *unused)
 {
+       static const float cons[4] = {0.15915494309189535, 0.5, 6.28318530717959, -3.14159265358979};
+       unsigned int temp;
+       unsigned int constant;
+
        if (inst->U.I.Opcode != RC_OPCODE_COS &&
            inst->U.I.Opcode != RC_OPCODE_SIN &&
            inst->U.I.Opcode != RC_OPCODE_SCS)
@@ -1030,10 +1038,6 @@ int r300_transform_trig_scale_vertex(struct radeon_compiler *c,
         *   repeat(x) = frac(x / 2PI + 0.5) * 2PI - PI
         */
 
-       static const float cons[4] = {0.15915494309189535, 0.5, 6.28318530717959, -3.14159265358979};
-       unsigned int temp;
-       unsigned int constant;
-
        temp = rc_find_free_temporary(c);
        constant = rc_constants_add_immediate_vec4(&c->Program.Constants, cons);