fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix state.texgen parsing error (bug 12313).

Browse source 
Replace *(*inst++) with *(*inst)++ in a few places.
This commit is contained in:
Brian 2007-09-13 11:29:00 -06:00
parent f3419d5ead
commit d799b7a7ec
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/shader/arbprogparse.c
View file

@ -1226,10 +1226,10 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
state_tokens[1] = coord; state_tokens[1] = coord;
/* EYE or OBJECT */ /* EYE or OBJECT */
type = *(*inst++); type = *(*inst)++;
/* 0 - s, 1 - t, 2 - r, 3 - q */ /* 0 - s, 1 - t, 2 - r, 3 - q */
coord = *(*inst++); coord = *(*inst)++;
if (type == TEX_GEN_EYE) { if (type == TEX_GEN_EYE) {
switch (coord) { switch (coord) {
@ -1245,6 +1245,9 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
case COMPONENT_W: case COMPONENT_W:
state_tokens[2] = STATE_TEXGEN_EYE_Q; state_tokens[2] = STATE_TEXGEN_EYE_Q;
break; break;
default:
_mesa_problem(ctx, "bad texgen component in "
"parse_state_single_item()");
} }
} }
else { else {
@ -1261,6 +1264,9 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
case COMPONENT_W: case COMPONENT_W:
state_tokens[2] = STATE_TEXGEN_OBJECT_Q; state_tokens[2] = STATE_TEXGEN_OBJECT_Q;
break; break;
default:
_mesa_problem(ctx, "bad texgen component in "
"parse_state_single_item()");
} }
} }
} }
@ -1283,7 +1289,7 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
break; break;
case STATE_POINT: case STATE_POINT:
switch (*(*inst++)) { switch (*(*inst)++) {
case POINT_SIZE: case POINT_SIZE:
state_tokens[0] = STATE_POINT_SIZE; state_tokens[0] = STATE_POINT_SIZE;
break; break;
@ -2454,8 +2460,9 @@ parse_src_reg (GLcontext * ctx, const GLubyte ** inst,
Program->Position = parse_position (inst); Program->Position = parse_position (inst);
if (!found) { if (!found) {
program_error(ctx, Program->Position, char s[1000];
"2: Undefined variable"); /* src->name */ sprintf(s, "Undefined variable: %s", src->name);
program_error(ctx, Program->Position, s);
return 1; return 1;
} }