mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-04 20:38:06 +02:00
mesa: fix state.clip[n].plane parsing bug (bug 16611)
cherry-picked from master
This commit is contained in:
parent
48b8a32c6d
commit
57f2d071d1
1 changed files with 6 additions and 3 deletions
|
|
@ -1133,7 +1133,9 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
|
|||
struct arb_program *Program,
|
||||
gl_state_index state_tokens[STATE_LENGTH])
|
||||
{
|
||||
switch (*(*inst)++) {
|
||||
GLubyte token = *(*inst)++;
|
||||
|
||||
switch (token) {
|
||||
case STATE_MATERIAL_PARSER:
|
||||
state_tokens[0] = STATE_MATERIAL;
|
||||
state_tokens[1] = parse_face_type (inst);
|
||||
|
|
@ -1318,7 +1320,6 @@ parse_state_single_item (GLcontext * ctx, const GLubyte ** inst,
|
|||
|
||||
case STATE_CLIP_PLANE:
|
||||
state_tokens[0] = STATE_CLIPPLANE;
|
||||
state_tokens[1] = parse_integer (inst, Program);
|
||||
if (parse_clipplane_num (ctx, inst, Program,
|
||||
(GLint *) &state_tokens[1]))
|
||||
return 1;
|
||||
|
|
@ -1770,7 +1771,9 @@ parse_param_elements (GLcontext * ctx, const GLubyte ** inst,
|
|||
gl_state_index state_tokens[STATE_LENGTH] = {0, 0, 0, 0, 0};
|
||||
GLfloat const_values[4];
|
||||
|
||||
switch (*(*inst)++) {
|
||||
GLubyte token = *(*inst)++;
|
||||
|
||||
switch (token) {
|
||||
case PARAM_STATE_ELEMENT:
|
||||
if (parse_state_single_item (ctx, inst, Program, state_tokens))
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue