mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-21 05:00:09 +01:00
misc changes from testing
This commit is contained in:
parent
80b8665438
commit
62dc802818
1 changed files with 10 additions and 2 deletions
|
|
@ -69,14 +69,22 @@ static void Display(void)
|
||||||
if (useProgram) {
|
if (useProgram) {
|
||||||
glVertexAttribPointerNV( 0, 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
|
glVertexAttribPointerNV( 0, 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
|
||||||
glEnableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
|
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 {
|
else {
|
||||||
glVertexPointer( 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
|
glVertexPointer( 3, GL_FLOAT, 6 * sizeof(GLfloat), data );
|
||||||
glEnableClientState( GL_VERTEX_ARRAY );
|
glEnableClientState( GL_VERTEX_ARRAY );
|
||||||
}
|
|
||||||
glNormalPointer( GL_FLOAT, 6 * sizeof(GLfloat), ((GLfloat *) data) + 3);
|
glNormalPointer( GL_FLOAT, 6 * sizeof(GLfloat), ((GLfloat *) data) + 3);
|
||||||
glEnableClientState( GL_NORMAL_ARRAY );
|
glEnableClientState( GL_NORMAL_ARRAY );
|
||||||
|
|
||||||
|
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
|
||||||
|
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY2_NV);
|
||||||
|
}
|
||||||
|
|
||||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, numverts);
|
glDrawArrays(GL_TRIANGLE_STRIP, 0, numverts);
|
||||||
|
|
||||||
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
|
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue