Mesa (master): progs/glsl: set generic vertex attribute values

[Brian Paul]

Module: Mesa
Branch: master
Commit: 08ecd863ee12601ea95818e02889a9807fd7a62d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08ecd863ee12601ea95818e02889a9807fd7a62d

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug 13 16:02:24 2009 -0600

progs/glsl: set generic vertex attribute values

---

 progs/glsl/shtest.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c
index 09b2593..97f6f9f 100644
--- a/progs/glsl/shtest.c
+++ b/progs/glsl/shtest.c
@@ -133,7 +133,20 @@ SquareVertex(GLfloat s, GLfloat t, GLfloat size)
 {
    GLfloat x = -size + s * 2.0 * size;
    GLfloat y = -size + t * 2.0 * size;
-   glTexCoord2f(s, t);
+   GLuint i;
+
+   glMultiTexCoord2f(GL_TEXTURE0, s, t);
+   glMultiTexCoord2f(GL_TEXTURE1, s, t);
+   glMultiTexCoord2f(GL_TEXTURE2, s, t);
+   glMultiTexCoord2f(GL_TEXTURE3, s, t);
+
+   /* assign (s,t) to the generic attributes */
+   for (i = 0; i < NumAttribs; i++) {
+      if (Attribs[i].location >= 0) {
+         glVertexAttrib2f(Attribs[i].location, s, t);
+      }
+   }
+
    glVertex2f(x, y);
 }
 
@@ -148,7 +161,7 @@ Square(GLfloat size)
    glNormal3f(0, 0, 1);
    glVertexAttrib3f(tangentAttrib, 1, 0, 0);
    glBegin(GL_POLYGON);
-#if 0
+#if 1
    SquareVertex(0, 0, size);
    SquareVertex(1, 0, size);
    SquareVertex(1, 1, size);