KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300/compiler: Move declaration before code. 

Fixes these GCC warning on linux-x86 build.
radeon_optimize.c: In function ‘constant_folding’:
radeon_optimize.c:419: warning: ISO C90 forbids mixed declarations and code
radeon_optimize.c:425: warning: ISO C90 forbids mixed declarations and code
radeon_optimize.c:432: warning: ISO C90 forbids mixed declarations and code
This commit is contained in:
Vinson Lee 2010-09-29 13:30:34 -07:00
parent 38c31de445
commit 4cd4fd37aa
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
View File

@ -411,27 +411,34 @@ static void constant_folding(struct radeon_compiler * c, struct rc_instruction *
/* Replace 0.0, 1.0 and 0.5 immediates by their explicit swizzles */ /* Replace 0.0, 1.0 and 0.5 immediates by their explicit swizzles */
for(unsigned int src = 0; src < opcode->NumSrcRegs; ++src) { for(unsigned int src = 0; src < opcode->NumSrcRegs; ++src) {
struct rc_constant * constant;
struct rc_src_register newsrc;
int have_real_reference;
if (inst->U.I.SrcReg[src].File != RC_FILE_CONSTANT || if (inst->U.I.SrcReg[src].File != RC_FILE_CONSTANT ||
inst->U.I.SrcReg[src].RelAddr || inst->U.I.SrcReg[src].RelAddr ||
inst->U.I.SrcReg[src].Index >= c->Program.Constants.Count) inst->U.I.SrcReg[src].Index >= c->Program.Constants.Count)
continue; continue;
struct rc_constant * constant = constant =
&c->Program.Constants.Constants[inst->U.I.SrcReg[src].Index]; &c->Program.Constants.Constants[inst->U.I.SrcReg[src].Index];
if (constant->Type != RC_CONSTANT_IMMEDIATE) if (constant->Type != RC_CONSTANT_IMMEDIATE)
continue; continue;
struct rc_src_register newsrc = inst->U.I.SrcReg[src]; newsrc = inst->U.I.SrcReg[src];
int have_real_reference = 0; have_real_reference = 0;
for(unsigned int chan = 0; chan < 4; ++chan) { for(unsigned int chan = 0; chan < 4; ++chan) {
unsigned int swz = GET_SWZ(newsrc.Swizzle, chan); unsigned int swz = GET_SWZ(newsrc.Swizzle, chan);
unsigned int newswz;
float imm;
float baseimm;
if (swz >= 4) if (swz >= 4)
continue; continue;
unsigned int newswz; imm = constant->u.Immediate[swz];
float imm = constant->u.Immediate[swz]; baseimm = imm;
float baseimm = imm;
if (imm < 0.0) if (imm < 0.0)
baseimm = -baseimm; baseimm = -baseimm;