diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-31 21:52:56 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-31 21:52:56 +0000 |
| commit | ffec105109f5b16bfe8282bd477d4aa32b550015 (patch) | |
| tree | cb7680c14b8d0630b3075745aa9ec07889743643 /src/mesa/drivers/dri/r300/r300_fragprog.c | |
| parent | dcf4c17fb1624af47181c63af4c3ad29f919c17a (diff) | |
fix problems found with gcc 2.96 (bug 4934)
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_fragprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c index 4236bdbcca..35b254616b 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog.c @@ -277,9 +277,9 @@ static void free_temp(struct r300_fragment_program *rp, pfs_reg_t r) static pfs_reg_t emit_param4fv(struct r300_fragment_program *rp, GLfloat *values) { pfs_reg_t r = pfs_default_reg; - r.type = REG_TYPE_CONST; int pidx; + r.type = REG_TYPE_CONST; pidx = rp->param_nr++; r.index = rp->const_nr++; if (pidx >= PFS_NUM_CONST_REGS || r.index >= PFS_NUM_CONST_REGS) { @@ -626,6 +626,7 @@ static void emit_arith(struct r300_fragment_program *rp, int op, int argc; int vop, sop; int i; + int str; if (!dest.valid || !src0.valid || !src1.valid || !src2.valid) { ERROR("invalid register. dest/src0/src1/src2 valid = %d/%d/%d/%d\n", @@ -657,7 +658,6 @@ static void emit_arith(struct r300_fragment_program *rp, int op, return; } - int str; for (i=0;i<3;i++) { if (i<argc) { hwsrc = t_hw_src(rp, src[i]); |