From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 12 Nov 2008 23:44:47 +0000 (-0700)
Subject: mesa: fix bug in GLSL built-in matrix state lookup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47b883e42ba5f6948ce8050d5a3c7849ba2a1cec;p=mesa.git

mesa: fix bug in GLSL built-in matrix state lookup
---

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;