mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-04 22:10:11 +01:00
enable program and arrays by default, minor clean-ups
This commit is contained in:
parent
041e66b0d6
commit
919404fd1d
1 changed files with 3 additions and 8 deletions
|
|
@ -21,8 +21,8 @@ static GLint numverts;
|
|||
|
||||
static GLfloat xrot;
|
||||
static GLfloat yrot;
|
||||
static GLboolean useArrays = GL_FALSE;
|
||||
static GLboolean useProgram = GL_FALSE;
|
||||
static GLboolean useArrays = GL_TRUE;
|
||||
static GLboolean useProgram = GL_TRUE;
|
||||
|
||||
|
||||
static void read_surface( char *filename )
|
||||
|
|
@ -71,23 +71,18 @@ static void Display(void)
|
|||
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);
|
||||
}
|
||||
|
||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, numverts);
|
||||
|
||||
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY0_NV );
|
||||
glDisableClientState( GL_VERTEX_ATTRIB_ARRAY2_NV);
|
||||
glDisableClientState( GL_VERTEX_ARRAY );
|
||||
glDisableClientState( GL_NORMAL_ARRAY );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue