From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 13 Nov 2008 15:47:36 +0000 (-0700)
Subject: mesa: fix accidental regression in GLSL built-in texture matrix lookup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe984aed5a9ee7c6e000d48a0a584b964fefa848;p=mesa.git

mesa: fix accidental regression in GLSL built-in texture matrix lookup

Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.
---

diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/shader/slang/slang_builtin.c
index 20fafee4b9e..db00c54b8a2 100644
--- a/src/mesa/shader/slang/slang_builtin.c
+++ b/src/mesa/shader/slang/slang_builtin.c
@@ -108,6 +108,7 @@ lookup_statevar(const char *var, GLint index1, GLint index2, const char *field,
       if (tokens[0] == STATE_TEXTURE_MATRIX) {
          if (index1 >= 0) {
             tokens[1] = index1; /* which texture matrix */
+            index1 = 0; /* prevent extra addition at end of function */
          }
       }
       if (index1 < 0) {