demos: use glEnable/DisableClientState() for vertex arrays

diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c
index 6923ca2bba84b8aab5e78703e5e83df076367f2e..2e9dff172613b1da5688a74d2dadf740a498ac27 100644 (file)
--- a/progs/demos/isosurf.c
+++ b/progs/demos/isosurf.c
@@ -847,8 +847,8 @@ static void Init(int argc, char *argv[])
 
    glClearColor(0.0, 0.0, 1.0, 0.0);
    glEnable( GL_DEPTH_TEST );
-   glEnable( GL_VERTEX_ARRAY_EXT );
-   glEnable( GL_NORMAL_ARRAY_EXT );
+   glEnableClientState( GL_VERTEX_ARRAY );
+   glEnableClientState( GL_NORMAL_ARRAY );
 
    glMatrixMode(GL_PROJECTION);
    glLoadIdentity();

diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c
index cbf173304c1a108797f3329ccff4cf8daa25567c..2e3770dc401a0522a5a05930dbfbc858097ee93f 100644 (file)
--- a/progs/glsl/multitex.c
+++ b/progs/glsl/multitex.c
@@ -140,7 +140,7 @@ DrawPolygonArray(void)
    }
    else {
       glVertexPointer(2, GL_FLOAT, 0, vertPtr);
-      glEnable(GL_VERTEX_ARRAY);
+      glEnableClientState(GL_VERTEX_ARRAY);
    }
 
    glVertexAttribPointer_func(TexCoord0_attr, 2, GL_FLOAT, GL_FALSE,

diff --git a/progs/slang/vstest.c b/progs/slang/vstest.c
index 5108d157428d36c62ffd6b9d52bb06fcd1aa2eab..472ea9b62e2abecb5015122f0bc3f93c81a9b34c 100644 (file)
--- a/progs/slang/vstest.c
+++ b/progs/slang/vstest.c
@@ -128,29 +128,29 @@ static void va_render ()
       {
       case C:
          glColorPointer (4, GL_FLOAT, 0, att->data);
-         glEnable (GL_COLOR_ARRAY);
+         glEnableClientState (GL_COLOR_ARRAY);
          break;
       case S:
          glSecondaryColorPointerEXT (4, GL_FLOAT, 0, att->data);
-         glEnable (GL_SECONDARY_COLOR_ARRAY_EXT);
+         glEnableClientState (GL_SECONDARY_COLOR_ARRAY_EXT);
          break;
       case N:
          glNormalPointer (GL_FLOAT, 0, att->data);
-         glEnable (GL_NORMAL_ARRAY);
+         glEnableClientState (GL_NORMAL_ARRAY);
          break;
       case V:
          glVertexPointer (4, GL_FLOAT, 0, att->data);
-         glEnable (GL_VERTEX_ARRAY);
+         glEnableClientState (GL_VERTEX_ARRAY);
          break;
       case T:
          assert (att->index >= 0 && att->index < 8);
          glClientActiveTextureARB (GL_TEXTURE0_ARB + att->index);
          glTexCoordPointer (4, GL_FLOAT, 0, att->data);
-         glEnable (GL_TEXTURE_COORD_ARRAY);
+         glEnableClientState (GL_TEXTURE_COORD_ARRAY);
          break;
       case F:
          glFogCoordPointerEXT (GL_FLOAT, 0, att->data);
-         glEnable (GL_FOG_COORDINATE_ARRAY_EXT);
+         glEnableClientState (GL_FOG_COORDINATE_ARRAY_EXT);
          break;
       case A:
          assert (att->index > 0 && att->index < 16);
@@ -169,23 +169,23 @@ static void va_render ()
       switch (att->dispatch)
       {
       case C:
-         glDisable (GL_COLOR_ARRAY);
+         glDisableClientState (GL_COLOR_ARRAY);
          break;
       case S:
-         glDisable (GL_SECONDARY_COLOR_ARRAY_EXT);
+         glDisableClientState (GL_SECONDARY_COLOR_ARRAY_EXT);
          break;
       case N:
-         glDisable (GL_NORMAL_ARRAY);
+         glDisableClientState (GL_NORMAL_ARRAY);
          break;
       case V:
-         glDisable (GL_VERTEX_ARRAY);
+         glDisableClientState (GL_VERTEX_ARRAY);
          break;
       case T:
          glClientActiveTextureARB (GL_TEXTURE0_ARB + att->index);
-         glDisable (GL_TEXTURE_COORD_ARRAY);
+         glDisableClientState (GL_TEXTURE_COORD_ARRAY);
          break;
       case F:
-         glDisable (GL_FOG_COORDINATE_ARRAY_EXT);
+         glDisableClientState (GL_FOG_COORDINATE_ARRAY_EXT);
          break;
       case A:
          glDisableVertexAttribArrayARB (att->index);

diff --git a/progs/tests/bufferobj.c b/progs/tests/bufferobj.c
index 220bd1f50627ca6074f0a96919bc42380c4e5168..d4ca2700160a2a59d81b091a7f2865e24d4f738e 100644 (file)
--- a/progs/tests/bufferobj.c
+++ b/progs/tests/bufferobj.c
@@ -73,7 +73,7 @@ static void DrawObject( const struct object *obj )
 
       glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
       glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) obj->VertexOffset);
-      glEnable(GL_VERTEX_ARRAY);
+      glEnableClientState(GL_VERTEX_ARRAY);
 
       /* test push/pop attrib */
       /* XXX this leads to a segfault with NVIDIA's 53.36 driver */
@@ -88,7 +88,7 @@ static void DrawObject( const struct object *obj )
 #endif
       glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
       glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
-      glEnable(GL_COLOR_ARRAY);
+      glEnableClientState(GL_COLOR_ARRAY);
 
       if (obj->NumElements > 0) {
          /* indexed arrays */
@@ -223,11 +223,11 @@ CreateVertexArrayObject(struct object *obj)
 
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
    glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) obj->VertexOffset);
-   glEnable(GL_VERTEX_ARRAY);
+   glEnableClientState(GL_VERTEX_ARRAY);
 
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
    glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
-   glEnable(GL_COLOR_ARRAY);
+   glEnableClientState(GL_COLOR_ARRAY);
 
    glBindVertexArray(0);
 }

diff --git a/progs/tests/mapbufrange.c b/progs/tests/mapbufrange.c
index 0021bb2607126247c4ae888bbbd928dfd8e0d780..76e02dd4069284478e7a71770b903360c3c4a122 100644 (file)
--- a/progs/tests/mapbufrange.c
+++ b/progs/tests/mapbufrange.c
@@ -98,10 +98,10 @@ Draw(void)
 {
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, BufferID);
    glVertexPointer(3, GL_FLOAT, 24, 0);
-   glEnable(GL_VERTEX_ARRAY);
+   glEnableClientState(GL_VERTEX_ARRAY);
 
    glColorPointer(3, GL_FLOAT, 24, (void*) 12);
-   glEnable(GL_COLOR_ARRAY);
+   glEnableClientState(GL_COLOR_ARRAY);
 
    glDrawArrays(GL_QUADS, 0, NumRects * 4);
 

diff --git a/progs/tests/mapvbo.c b/progs/tests/mapvbo.c
index c392e7683583a410c2f90473d9fd5fe12caa416d..52a22a5e7917ec2f9959ddebd226f52aa45073c0 100644 (file)
--- a/progs/tests/mapvbo.c
+++ b/progs/tests/mapvbo.c
@@ -54,10 +54,10 @@ Draw(void)
 
    glBindBufferARB(GL_ARRAY_BUFFER_ARB, BufferID);
    glVertexPointer(3, GL_FLOAT, 24, 0);
-   glEnable(GL_VERTEX_ARRAY);
+   glEnableClientState(GL_VERTEX_ARRAY);
 
    glColorPointer(3, GL_FLOAT, 24, (void*) 12);
-   glEnable(GL_COLOR_ARRAY);
+   glEnableClientState(GL_COLOR_ARRAY);
 
    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 

diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c
index 5a5d084f90913bcced4ecab280736933a480a516..df9f7ad784b053cedaec2fc54f272c53a17281e0 100644 (file)
--- a/progs/xdemos/glxswapcontrol.c
+++ b/progs/xdemos/glxswapcontrol.c
@@ -303,13 +303,13 @@ draw(void)
       glDisable(GL_LIGHTING);
       glShadeModel(GL_SMOOTH);
 
-      glEnable( GL_VERTEX_ARRAY );
-      glEnable( GL_COLOR_ARRAY );
+      glEnableClientState( GL_VERTEX_ARRAY );
+      glEnableClientState( GL_COLOR_ARRAY );
       glVertexPointer( 3, GL_FLOAT, 0, vert );
       glColorPointer( 3, GL_FLOAT, 0, col );
       glDrawArrays( GL_POLYGON, 0, 4 );
-      glDisable( GL_COLOR_ARRAY );
-      glDisable( GL_VERTEX_ARRAY );
+      glDisableClientState( GL_COLOR_ARRAY );
+      glDisableClientState( GL_VERTEX_ARRAY );
 
       glMatrixMode(GL_PROJECTION);
       glLoadIdentity();