summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorKarl Rasche <[email protected]>2003-11-30 15:59:28 +0000
committerKarl Rasche <[email protected]>2003-11-30 15:59:28 +0000
commit1df1547f9e76232459a471c30b37cc0eaeb783ab (patch)
tree6cd7c25540637b6a2fc6b86b9a51f5669c901c1c /src/mesa/main
parentde0dd65aeec33284019a766ac113028cf9bffe5b (diff)
Fixed compiler warnings
Assign the correct thing to TexturesUsed[]
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/arbparse.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/arbparse.c b/src/mesa/main/arbparse.c
index d7e81e12ef8..1afa3395b9c 100644
--- a/src/mesa/main/arbparse.c
+++ b/src/mesa/main/arbparse.c
@@ -2851,11 +2851,11 @@ parse_sign (GLubyte ** inst)
/*return *(*inst)++ != '+'; */
if (**inst == '-') {
- *(*inst)++;
+ (*inst)++;
return 1;
}
else if (**inst == '+') {
- *(*inst)++;
+ (*inst)++;
return 0;
}
@@ -2880,7 +2880,7 @@ parse_integer (GLubyte ** inst, struct arb_program *Program)
* if yes, increment the *inst and return the default value
*/
if (**inst == 0) {
- *(*inst)++;
+ (*inst)++;
return 0;
}
@@ -3038,7 +3038,6 @@ parse_texcoord_num (GLcontext * ctx, GLubyte ** inst,
return 1;
}
- Program->TexturesUsed[*coord] = 1;
return 0;
}
@@ -3958,7 +3957,7 @@ parse_param_elements (GLcontext * ctx, GLubyte ** inst,
}
else
{
- (*(*inst)++);
+ (*inst)++;
}
break;
@@ -4601,7 +4600,7 @@ parse_src_reg (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
case REGISTER_PARAM:
switch (**inst) {
case PARAM_ARRAY_ELEMENT:
- *(*inst)++;
+ (*inst)++;
src = parse_string (inst, vc_head, Program, &found);
Program->Position = parse_position (inst);
@@ -5138,6 +5137,7 @@ parse_fp_instruction (GLcontext * ctx, GLubyte ** inst,
fp->TexSrcBit = TEXTURE_CUBE_BIT;
break;
}
+ Program->TexturesUsed[texcoord] |= fp->TexSrcBit;
break;
case F_TEX_KIL: