summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-05-30 15:38:26 +0000
committerBrian Paul <[email protected]>2003-05-30 15:38:26 +0000
commit62dc802818f865484b53b28548b6b51e67fdff09 (patch)
treeea44ac51a77d8e47a59cebf2e5e071db12a5e0e5 /progs
parent80b86654384860b8e8cabca08a860cfc61aa4d14 (diff)
misc changes from testing
Diffstat (limited to 'progs')
-rw-r--r--progs/tests/vparray.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c
index d7d2db2bdbd..65a3bbfefc3 100644
--- a/progs/tests/vparray.c
+++ b/progs/tests/vparray.c
@@ -69,13 +69,21 @@ static void Display(void)
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);