From aa5b748c10a8537ccbf6ed9d09d0783df7314c70 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 31 Jul 2007 09:29:31 -0600
Subject: [PATCH] glGetAttribLocation always returned 1 (bug 11774)

---
 docs/relnotes-7.0.1.html           | 1 +
 src/mesa/shader/slang/slang_link.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/relnotes-7.0.1.html b/docs/relnotes-7.0.1.html
index 28522552eae..e6dab926698 100644
--- a/docs/relnotes-7.0.1.html
+++ b/docs/relnotes-7.0.1.html
@@ -46,6 +46,7 @@ the terminating zero (bug 11588)
 <li>glXChooseFBConfig() in Xlib driver didn't handle GLX_STEREO flag properly
 <li>Fixed a GLSL function call bug (#11731)
 <li>glPointParameteriv(GL_DISTANCE_ATTENUATION_EXT) didn't work (bug 11754)
+<li>glGetAttribLocation() always returned 1 (bug 11774)
 </ul>
 
 
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index d6d1c7523e5..7b0868e80e5 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -329,8 +329,10 @@ _slang_resolve_attributes(struct gl_shader_program *shProg,
                 * glVertex/position.
                 */
                for (attr = 1; attr < MAX_VERTEX_ATTRIBS; attr++) {
-                  if (((1 << attr) & usedAttributes) == 0)
+                  if (((1 << attr) & usedAttributes) == 0) {
+                     usedAttributes |= (1 << attr);
                      break;
+                  }
                }
                if (attr == MAX_VERTEX_ATTRIBS) {
                   /* too many!  XXX record error log */