commit 62dc802818f865484b53b28548b6b51e67fdff09
author Brian Paul <brian.paul@tungstengraphics.com> Fri May 30 15:38:26 2003 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Fri May 30 15:38:26 2003 +0000
tree ea44ac51a77d8e47a59cebf2e5e071db12a5e0e5
parent 80b86654384860b8e8cabca08a860cfc61aa4d14

misc changes from testing

progs/tests/vparray.c

diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c
index d7d2db2..65a3bbf 100644
--- a/progs/tests/vparray.c
+++ b/progs/tests/vparray.c
@@ -69,13 +69,21 @@
          if (useProgram) {
             glVertexAttribPointerNV( 0, 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
             glEnableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
+            glVertexAttribPointerNV( 2, 3, GL_FLOAT, 6 * sizeof(GLfloat), ((GLfloat *) data) + 3);
+            glEnableClientState( GL_VERTEX_ATTRIB_ARRAY2_NV);
+
+            glDisableClientState( GL_VERTEX_ARRAY );
+            glDisableClientState( GL_NORMAL_ARRAY );
          }
          else {
             glVertexPointer( 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
             glEnableClientState( GL_VERTEX_ARRAY );
+            glNormalPointer( GL_FLOAT, 6 * sizeof(GLfloat), ((GLfloat *) data) + 3);
+            glEnableClientState( GL_NORMAL_ARRAY );
+
+            glDisableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
+            glDisableClientState( GL_VERTEX_ATTRIB_ARRAY2_NV);
          }
-         glNormalPointer( GL_FLOAT, 6 * sizeof(GLfloat), ((GLfloat *) data) + 3);
-         glEnableClientState( GL_NORMAL_ARRAY );
 
          glDrawArrays(GL_TRIANGLE_STRIP, 0, numverts);