From 47b883e42ba5f6948ce8050d5a3c7849ba2a1cec Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 12 Nov 2008 16:44:47 -0700 Subject: mesa: fix bug in GLSL built-in matrix state lookup --- src/mesa/shader/slang/slang_builtin.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mesa/shader/slang') diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/shader/slang/slang_builtin.c index ed6de40d4b6..fdcd3714a5c 100644 --- a/src/mesa/shader/slang/slang_builtin.c +++ b/src/mesa/shader/slang/slang_builtin.c @@ -109,10 +109,13 @@ lookup_statevar(const char *var, GLint index1, GLint index2, const char *field, if (isMatrix) { if (tokens[0] == STATE_TEXTURE_MATRIX) { if (index1 >= 0) { - tokens[1] = index1; - index1 = 0; /* prevent extra addition at end of function */ + tokens[1] = index1; /* which texture matrix */ } } + if (index1 < 0) { + /* index1 is unused: prevent extra addition at end of function */ + index1 = 0; + } } else if (strcmp(var, "gl_DepthRange") == 0) { tokens[0] = STATE_DEPTH_RANGE; -- cgit v1.2.3