Merge branch 'arb_vertex_array_object'

2009-06-26 17:49:14 -06:00 · 2009-06-26 17:49:14 -06:00 · f57280cc73
parent a18e209edb b2a1ca4fcf
commit f57280cc73
26 changed files with 3176 additions and 2815 deletions
--- a/docs/relnotes-7.6.html
+++ b/docs/relnotes-7.6.html
@ -37,6 +37,8 @@ tbd
 <li><a href="openvg.html">OpenVG</a> front-end (state tracker for Gallium).
 This was written by Zack Rusin at Tungsten Graphics.
 <li>GL_APPLE_vertex_array_object for Gallium drivers and Intel DRI drivers.
+<li>GL_ARB_vertex_array_object for Gallium drivers, software drivers and
+    Intel DRI drivers.
 <li>GL_ARB_copy_buffer extension (supported in Gallium and swrast drivers)
 <LI>GL_ARB_map_buffer_range extension (supported in Gallium and software drivers)
 <li>GL_EXT_provoking_vertex extension (supported in Gallium and software drivers)
--- a/progs/tests/bufferobj.c
+++ b/progs/tests/bufferobj.c
@ -1,5 +1,6 @@
 /*
 * Test GL_ARB_vertex_buffer_object
+ * Also test GL_ARB_vertex_array_object if supported
 *
 * Brian Paul
 * 16 Sep 2003
@ -9,6 +10,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include <GL/glew.h>
 #include <GL/glut.h>
@ -17,6 +19,7 @@

 struct object
 {
+   GLuint ArrayObjectID; /** GL_ARB_vertex_array_object */
   GLuint VertexBufferID;
   GLuint ColorBufferID;
   GLuint ElementsBufferID;
@ -35,6 +38,7 @@ static GLuint Win;

 static GLfloat Xrot = 0, Yrot = 0, Zrot = 0;
 static GLboolean Anim = GL_TRUE;
+static GLboolean Have_ARB_vertex_array_object = GL_FALSE;


 static void CheckError(int line)
@ -48,34 +52,54 @@ static void CheckError(int line)

 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);
+   if (Have_ARB_vertex_array_object && obj->ArrayObjectID) {
+      glBindVertexArray(obj->ArrayObjectID);

-   /* test push/pop attrib */
-   /* XXX this leads to a segfault with NVIDIA's 53.36 driver */
-#if 0
-   if (1)
-   {
-      glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
-      /*glVertexPointer(3, GL_FLOAT, 0, (void *) (obj->VertexOffset + 10000));*/
-      glBindBufferARB(GL_ARRAY_BUFFER_ARB, 999999);
-      glPopClientAttrib();
-   }
-#endif
-   glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
-   glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
-   glEnable(GL_COLOR_ARRAY);
+      if (obj->NumElements > 0) {
+         /* indexed arrays */
+         glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, obj->ElementsBufferID);
+         glDrawElements(GL_LINE_LOOP, obj->NumElements, GL_UNSIGNED_INT, NULL);
+      }
+      else {
+         /* non-indexed arrays */
+         glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+         glDrawArrays(GL_LINE_LOOP, 0, obj->NumVerts);
+      }

-   if (obj->NumElements > 0) {
-      /* indexed arrays */
-      glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, obj->ElementsBufferID);
-      glDrawElements(GL_LINE_LOOP, obj->NumElements, GL_UNSIGNED_INT, NULL);
+      glBindVertexArray(0);
   }
   else {
-      /* non-indexed arrays */
-      glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
-      glDrawArrays(GL_LINE_LOOP, 0, obj->NumVerts);
+      /* no vertex array objects, must set vertex/color pointers per draw */
+
+      glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
+      glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) obj->VertexOffset);
+      glEnable(GL_VERTEX_ARRAY);
+
+      /* test push/pop attrib */
+      /* XXX this leads to a segfault with NVIDIA's 53.36 driver */
+#if 0
+      if (1)
+      {
+         glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
+         /*glVertexPointer(3, GL_FLOAT, 0, (void *) (obj->VertexOffset + 10000));*/
+         glBindBufferARB(GL_ARRAY_BUFFER_ARB, 999999);
+         glPopClientAttrib();
+      }
+#endif
+      glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
+      glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
+      glEnable(GL_COLOR_ARRAY);
+
+      if (obj->NumElements > 0) {
+         /* indexed arrays */
+         glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, obj->ElementsBufferID);
+         glDrawElements(GL_LINE_LOOP, obj->NumElements, GL_UNSIGNED_INT, NULL);
+      }
+      else {
+         /* non-indexed arrays */
+         glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+         glDrawArrays(GL_LINE_LOOP, 0, obj->NumVerts);
+      }
   }
 }

@ -187,6 +211,28 @@ static void SpecialKey( int key, int x, int y )
 }


+/**
+ * If GL_ARB_vertex_array_object is supported, create an array object
+ * and set all the per-array state.
+ */
+static void
+CreateVertexArrayObject(struct object *obj)
+{
+   glGenVertexArrays(1, &obj->ArrayObjectID);
+   glBindVertexArray(obj->ArrayObjectID);
+
+   glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->VertexBufferID);
+   glVertexPointer(3, GL_FLOAT, obj->VertexStride, (void *) obj->VertexOffset);
+   glEnable(GL_VERTEX_ARRAY);
+
+   glBindBufferARB(GL_ARRAY_BUFFER_ARB, obj->ColorBufferID);
+   glColorPointer(3, GL_FLOAT, obj->ColorStride, (void *) obj->ColorOffset);
+   glEnable(GL_COLOR_ARRAY);
+
+   glBindVertexArray(0);
+}
+
+
 /*
 * Non-interleaved position/color data.
 */
@ -262,6 +308,10 @@ static void MakeObject1(struct object *obj)

   glGetBufferParameterivARB(GL_ARRAY_BUFFER_ARB, GL_BUFFER_MAPPED_ARB, &i);
   assert(!i);
+
+   if (Have_ARB_vertex_array_object) {
+      CreateVertexArrayObject(obj);
+   }
 }


@ -297,6 +347,10 @@ static void MakeObject2(struct object *obj)
   obj->NumElements = 0;

   glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
+
+   if (Have_ARB_vertex_array_object) {
+      CreateVertexArrayObject(obj);
+   }
 }


@ -347,6 +401,10 @@ static void MakeObject3(struct object *obj)
   i[3] = 3;
   glUnmapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB);
   obj->NumElements = 4;
+
+   if (Have_ARB_vertex_array_object) {
+      CreateVertexArrayObject(obj);
+   }
 }


@ -387,6 +445,10 @@ static void MakeObject4(struct object *obj)
   /* Setup a buffer of indices to test the ELEMENTS path */
   obj->ElementsBufferID = 0;
   obj->NumElements = 0;
+
+   if (Have_ARB_vertex_array_object) {
+      CreateVertexArrayObject(obj);
+   }
 }


@ -399,6 +461,13 @@ static void Init( void )
   }
   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));

+   Have_ARB_vertex_array_object =
+      glutExtensionSupported("GL_ARB_vertex_array_object");
+
+   printf("Using GL_ARB_vertex_array_object: %s\n",
+          (Have_ARB_vertex_array_object ? "yes" : "no"));
+
+
   /* Test buffer object deletion */
   if (1) {
      static GLubyte data[1000];
@ -413,6 +482,7 @@ static void Init( void )
      assert(!glIsBufferARB(id));
   }

+   memset(Objects, 0, sizeof(Objects));
   MakeObject1(Objects + 0);
   MakeObject2(Objects + 1);
   MakeObject3(Objects + 2);
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@ -406,9 +406,10 @@ static const char UniformMatrix4fvARB_names[] =
    "";
 #endif

-#if defined(need_GL_APPLE_vertex_array_object)
+#if defined(need_GL_ARB_vertex_array_object) || defined(need_GL_APPLE_vertex_array_object)
 static const char DeleteVertexArraysAPPLE_names[] = 
    "ip\0" /* Parameter signature */
+    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "";
 #endif
@ -941,6 +942,13 @@ static const char WeightivARB_names[] =
    "";
 #endif

+#if defined(need_GL_SGIX_instruments)
+static const char PollInstrumentsSGIX_names[] = 
+    "p\0" /* Parameter signature */
+    "glPollInstrumentsSGIX\0"
+    "";
+#endif
+
 #if defined(need_GL_SUN_global_alpha)
 static const char GlobalAlphaFactordSUN_names[] = 
    "d\0" /* Parameter signature */
@ -2114,6 +2122,13 @@ static const char Tangent3fvEXT_names[] =
    "";
 #endif

+#if defined(need_GL_ARB_vertex_array_object)
+static const char GenVertexArrays_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGenVertexArrays\0"
+    "";
+#endif
+
 #if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char BindFramebufferEXT_names[] = 
    "ii\0" /* Parameter signature */
@ -2340,10 +2355,10 @@ static const char GetCombinerStageParameterfvNV_names[] =
    "";
 #endif

-#if defined(need_GL_EXT_coordinate_frame)
-static const char Binormal3fEXT_names[] = 
-    "fff\0" /* Parameter signature */
-    "glBinormal3fEXT\0"
+#if defined(need_GL_ARB_vertex_array_object)
+static const char BindVertexArray_names[] = 
+    "i\0" /* Parameter signature */
+    "glBindVertexArray\0"
    "";
 #endif

@ -3403,10 +3418,11 @@ static const char GetProgramParameterdvNV_names[] =
    "";
 #endif

-#if defined(need_GL_SGIX_instruments)
-static const char PollInstrumentsSGIX_names[] = 
-    "p\0" /* Parameter signature */
-    "glPollInstrumentsSGIX\0"
+#if defined(need_GL_ARB_vertex_array_object) || defined(need_GL_APPLE_vertex_array_object)
+static const char IsVertexArrayAPPLE_names[] = 
+    "i\0" /* Parameter signature */
+    "glIsVertexArray\0"
+    "glIsVertexArrayAPPLE\0"
    "";
 #endif

@ -3940,6 +3956,13 @@ static const char VertexWeightfEXT_names[] =
    "";
 #endif

+#if defined(need_GL_EXT_coordinate_frame)
+static const char Binormal3fEXT_names[] = 
+    "fff\0" /* Parameter signature */
+    "glBinormal3fEXT\0"
+    "";
+#endif
+
 #if defined(need_GL_VERSION_1_4) || defined(need_GL_EXT_fog_coord)
 static const char FogCoordfvEXT_names[] = 
    "p\0" /* Parameter signature */
@ -4055,13 +4078,6 @@ static const char BlendFuncSeparateEXT_names[] =
    "";
 #endif

-#if defined(need_GL_APPLE_vertex_array_object)
-static const char IsVertexArrayAPPLE_names[] = 
-    "i\0" /* Parameter signature */
-    "glIsVertexArrayAPPLE\0"
-    "";
-#endif
-
 #if defined(need_GL_ARB_map_buffer_range)
 static const char MapBufferRange_names[] = 
    "iiii\0" /* Parameter signature */
@ -4961,8 +4977,8 @@ static const struct dri_extension_function GL_3DFX_tbuffer_functions[] = {
 static const struct dri_extension_function GL_APPLE_vertex_array_object_functions[] = {
    { DeleteVertexArraysAPPLE_names, DeleteVertexArraysAPPLE_remap_index, -1 },
    { GenVertexArraysAPPLE_names, GenVertexArraysAPPLE_remap_index, -1 },
-    { BindVertexArrayAPPLE_names, BindVertexArrayAPPLE_remap_index, -1 },
    { IsVertexArrayAPPLE_names, IsVertexArrayAPPLE_remap_index, -1 },
+    { BindVertexArrayAPPLE_names, BindVertexArrayAPPLE_remap_index, -1 },
    { NULL, 0, 0 }
 };
 #endif
@ -5123,6 +5139,16 @@ static const struct dri_extension_function GL_ARB_transpose_matrix_functions[] =
 };
 #endif

+#if defined(need_GL_ARB_vertex_array_object)
+static const struct dri_extension_function GL_ARB_vertex_array_object_functions[] = {
+    { DeleteVertexArraysAPPLE_names, DeleteVertexArraysAPPLE_remap_index, -1 },
+    { GenVertexArrays_names, GenVertexArrays_remap_index, -1 },
+    { BindVertexArray_names, BindVertexArray_remap_index, -1 },
+    { IsVertexArrayAPPLE_names, IsVertexArrayAPPLE_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_vertex_blend)
 static const struct dri_extension_function GL_ARB_vertex_blend_functions[] = {
    { WeightubvARB_names, WeightubvARB_remap_index, -1 },
@ -5376,7 +5402,6 @@ static const struct dri_extension_function GL_EXT_coordinate_frame_functions[] =
    { Binormal3ivEXT_names, Binormal3ivEXT_remap_index, -1 },
    { Tangent3sEXT_names, Tangent3sEXT_remap_index, -1 },
    { Tangent3fvEXT_names, Tangent3fvEXT_remap_index, -1 },
-    { Binormal3fEXT_names, Binormal3fEXT_remap_index, -1 },
    { Tangent3dvEXT_names, Tangent3dvEXT_remap_index, -1 },
    { Binormal3bvEXT_names, Binormal3bvEXT_remap_index, -1 },
    { Binormal3dEXT_names, Binormal3dEXT_remap_index, -1 },
@ -5385,6 +5410,7 @@ static const struct dri_extension_function GL_EXT_coordinate_frame_functions[] =
    { Tangent3ivEXT_names, Tangent3ivEXT_remap_index, -1 },
    { Tangent3dEXT_names, Tangent3dEXT_remap_index, -1 },
    { Binormal3svEXT_names, Binormal3svEXT_remap_index, -1 },
+    { Binormal3fEXT_names, Binormal3fEXT_remap_index, -1 },
    { Binormal3dvEXT_names, Binormal3dvEXT_remap_index, -1 },
    { Tangent3iEXT_names, Tangent3iEXT_remap_index, -1 },
    { Tangent3bvEXT_names, Tangent3bvEXT_remap_index, -1 },
@ -6074,11 +6100,11 @@ static const struct dri_extension_function GL_SGIX_igloo_interface_functions[] =
 #if defined(need_GL_SGIX_instruments)
 static const struct dri_extension_function GL_SGIX_instruments_functions[] = {
    { ReadInstrumentsSGIX_names, ReadInstrumentsSGIX_remap_index, -1 },
+    { PollInstrumentsSGIX_names, PollInstrumentsSGIX_remap_index, -1 },
    { GetInstrumentsSGIX_names, GetInstrumentsSGIX_remap_index, -1 },
    { StartInstrumentsSGIX_names, StartInstrumentsSGIX_remap_index, -1 },
    { StopInstrumentsSGIX_names, StopInstrumentsSGIX_remap_index, -1 },
    { InstrumentsBufferSGIX_names, InstrumentsBufferSGIX_remap_index, -1 },
-    { PollInstrumentsSGIX_names, PollInstrumentsSGIX_remap_index, -1 },
    { NULL, 0, 0 }
 };
 #endif
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@ -34,6 +34,7 @@
 #define need_GL_ARB_occlusion_query
 #define need_GL_ARB_point_parameters
 #define need_GL_ARB_shader_objects
+#define need_GL_ARB_vertex_array_object
 #define need_GL_ARB_vertex_program
 #define need_GL_ARB_vertex_shader
 #define need_GL_ARB_window_pos
@ -77,6 +78,7 @@ static const struct dri_extension card_extensions[] = {
   { "GL_ARB_texture_env_dot3",           NULL },
   { "GL_ARB_texture_mirrored_repeat",    NULL },
   { "GL_ARB_texture_rectangle",          NULL },
+   { "GL_ARB_vertex_array_object",        GL_ARB_vertex_array_object_functions},
   { "GL_ARB_vertex_program",             GL_ARB_vertex_program_functions },
   { "GL_ARB_window_pos",                 GL_ARB_window_pos_functions },
   { "GL_EXT_blend_color",                GL_EXT_blend_color_functions },
--- a/src/mesa/glapi/ARB_vertex_array_object.xml
+++ b/src/mesa/glapi/ARB_vertex_array_object.xml
@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_vertex_array_object" number="54">
+
+    <enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/>
+
+    <function name="BindVertexArray" offset="assign">
+        <param name="array" type="GLuint"/>
+    </function>
+
+    <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE">
+        <param name="n" type="GLsizei"/>
+        <param name="arrays" type="const GLuint *"/>
+    </function>
+
+    <function name="GenVertexArrays" offset="assign">
+        <param name="n" type="GLsizei"/>
+        <param name="arrays" type="GLuint *"/>
+    </function>
+
+    <function name="IsVertexArray" alias="IsVertexArrayAPPLE">
+        <param name="array" type="GLuint"/>
+        <return type="GLboolean"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@ -50,6 +50,7 @@ API_XML = gl_API.xml \
 	ARB_copy_buffer.xml \
 	ARB_framebuffer_object.xml \
 	ARB_map_buffer_range.xml \
+	ARB_vertex_array_object.xml \
 	APPLE_vertex_array_object.xml \
 	EXT_provoking_vertex.xml

--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@ -1752,6 +1752,12 @@
 #define CALL_MapBufferRange(disp, parameters) (*((disp)->MapBufferRange)) parameters
 #define GET_MapBufferRange(disp) ((disp)->MapBufferRange)
 #define SET_MapBufferRange(disp, fn) ((disp)->MapBufferRange = fn)
+#define CALL_BindVertexArray(disp, parameters) (*((disp)->BindVertexArray)) parameters
+#define GET_BindVertexArray(disp) ((disp)->BindVertexArray)
+#define SET_BindVertexArray(disp, fn) ((disp)->BindVertexArray = fn)
+#define CALL_GenVertexArrays(disp, parameters) (*((disp)->GenVertexArrays)) parameters
+#define GET_GenVertexArrays(disp) ((disp)->GenVertexArrays)
+#define SET_GenVertexArrays(disp, fn) ((disp)->GenVertexArrays = fn)
 #define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
 #define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
 #define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
@ -2400,7 +2406,7 @@

 #else

-#define driDispatchRemapTable_size 371
+#define driDispatchRemapTable_size 373
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];

 #define AttachShader_remap_index 0
@ -2559,221 +2565,223 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define RenderbufferStorageMultisample_remap_index 153
 #define FlushMappedBufferRange_remap_index 154
 #define MapBufferRange_remap_index 155
-#define CopyBufferSubData_remap_index 156
-#define PolygonOffsetEXT_remap_index 157
-#define GetPixelTexGenParameterfvSGIS_remap_index 158
-#define GetPixelTexGenParameterivSGIS_remap_index 159
-#define PixelTexGenParameterfSGIS_remap_index 160
-#define PixelTexGenParameterfvSGIS_remap_index 161
-#define PixelTexGenParameteriSGIS_remap_index 162
-#define PixelTexGenParameterivSGIS_remap_index 163
-#define SampleMaskSGIS_remap_index 164
-#define SamplePatternSGIS_remap_index 165
-#define ColorPointerEXT_remap_index 166
-#define EdgeFlagPointerEXT_remap_index 167
-#define IndexPointerEXT_remap_index 168
-#define NormalPointerEXT_remap_index 169
-#define TexCoordPointerEXT_remap_index 170
-#define VertexPointerEXT_remap_index 171
-#define PointParameterfEXT_remap_index 172
-#define PointParameterfvEXT_remap_index 173
-#define LockArraysEXT_remap_index 174
-#define UnlockArraysEXT_remap_index 175
-#define CullParameterdvEXT_remap_index 176
-#define CullParameterfvEXT_remap_index 177
-#define SecondaryColor3bEXT_remap_index 178
-#define SecondaryColor3bvEXT_remap_index 179
-#define SecondaryColor3dEXT_remap_index 180
-#define SecondaryColor3dvEXT_remap_index 181
-#define SecondaryColor3fEXT_remap_index 182
-#define SecondaryColor3fvEXT_remap_index 183
-#define SecondaryColor3iEXT_remap_index 184
-#define SecondaryColor3ivEXT_remap_index 185
-#define SecondaryColor3sEXT_remap_index 186
-#define SecondaryColor3svEXT_remap_index 187
-#define SecondaryColor3ubEXT_remap_index 188
-#define SecondaryColor3ubvEXT_remap_index 189
-#define SecondaryColor3uiEXT_remap_index 190
-#define SecondaryColor3uivEXT_remap_index 191
-#define SecondaryColor3usEXT_remap_index 192
-#define SecondaryColor3usvEXT_remap_index 193
-#define SecondaryColorPointerEXT_remap_index 194
-#define MultiDrawArraysEXT_remap_index 195
-#define MultiDrawElementsEXT_remap_index 196
-#define FogCoordPointerEXT_remap_index 197
-#define FogCoorddEXT_remap_index 198
-#define FogCoorddvEXT_remap_index 199
-#define FogCoordfEXT_remap_index 200
-#define FogCoordfvEXT_remap_index 201
-#define PixelTexGenSGIX_remap_index 202
-#define BlendFuncSeparateEXT_remap_index 203
-#define FlushVertexArrayRangeNV_remap_index 204
-#define VertexArrayRangeNV_remap_index 205
-#define CombinerInputNV_remap_index 206
-#define CombinerOutputNV_remap_index 207
-#define CombinerParameterfNV_remap_index 208
-#define CombinerParameterfvNV_remap_index 209
-#define CombinerParameteriNV_remap_index 210
-#define CombinerParameterivNV_remap_index 211
-#define FinalCombinerInputNV_remap_index 212
-#define GetCombinerInputParameterfvNV_remap_index 213
-#define GetCombinerInputParameterivNV_remap_index 214
-#define GetCombinerOutputParameterfvNV_remap_index 215
-#define GetCombinerOutputParameterivNV_remap_index 216
-#define GetFinalCombinerInputParameterfvNV_remap_index 217
-#define GetFinalCombinerInputParameterivNV_remap_index 218
-#define ResizeBuffersMESA_remap_index 219
-#define WindowPos2dMESA_remap_index 220
-#define WindowPos2dvMESA_remap_index 221
-#define WindowPos2fMESA_remap_index 222
-#define WindowPos2fvMESA_remap_index 223
-#define WindowPos2iMESA_remap_index 224
-#define WindowPos2ivMESA_remap_index 225
-#define WindowPos2sMESA_remap_index 226
-#define WindowPos2svMESA_remap_index 227
-#define WindowPos3dMESA_remap_index 228
-#define WindowPos3dvMESA_remap_index 229
-#define WindowPos3fMESA_remap_index 230
-#define WindowPos3fvMESA_remap_index 231
-#define WindowPos3iMESA_remap_index 232
-#define WindowPos3ivMESA_remap_index 233
-#define WindowPos3sMESA_remap_index 234
-#define WindowPos3svMESA_remap_index 235
-#define WindowPos4dMESA_remap_index 236
-#define WindowPos4dvMESA_remap_index 237
-#define WindowPos4fMESA_remap_index 238
-#define WindowPos4fvMESA_remap_index 239
-#define WindowPos4iMESA_remap_index 240
-#define WindowPos4ivMESA_remap_index 241
-#define WindowPos4sMESA_remap_index 242
-#define WindowPos4svMESA_remap_index 243
-#define MultiModeDrawArraysIBM_remap_index 244
-#define MultiModeDrawElementsIBM_remap_index 245
-#define DeleteFencesNV_remap_index 246
-#define FinishFenceNV_remap_index 247
-#define GenFencesNV_remap_index 248
-#define GetFenceivNV_remap_index 249
-#define IsFenceNV_remap_index 250
-#define SetFenceNV_remap_index 251
-#define TestFenceNV_remap_index 252
-#define AreProgramsResidentNV_remap_index 253
-#define BindProgramNV_remap_index 254
-#define DeleteProgramsNV_remap_index 255
-#define ExecuteProgramNV_remap_index 256
-#define GenProgramsNV_remap_index 257
-#define GetProgramParameterdvNV_remap_index 258
-#define GetProgramParameterfvNV_remap_index 259
-#define GetProgramStringNV_remap_index 260
-#define GetProgramivNV_remap_index 261
-#define GetTrackMatrixivNV_remap_index 262
-#define GetVertexAttribPointervNV_remap_index 263
-#define GetVertexAttribdvNV_remap_index 264
-#define GetVertexAttribfvNV_remap_index 265
-#define GetVertexAttribivNV_remap_index 266
-#define IsProgramNV_remap_index 267
-#define LoadProgramNV_remap_index 268
-#define ProgramParameters4dvNV_remap_index 269
-#define ProgramParameters4fvNV_remap_index 270
-#define RequestResidentProgramsNV_remap_index 271
-#define TrackMatrixNV_remap_index 272
-#define VertexAttrib1dNV_remap_index 273
-#define VertexAttrib1dvNV_remap_index 274
-#define VertexAttrib1fNV_remap_index 275
-#define VertexAttrib1fvNV_remap_index 276
-#define VertexAttrib1sNV_remap_index 277
-#define VertexAttrib1svNV_remap_index 278
-#define VertexAttrib2dNV_remap_index 279
-#define VertexAttrib2dvNV_remap_index 280
-#define VertexAttrib2fNV_remap_index 281
-#define VertexAttrib2fvNV_remap_index 282
-#define VertexAttrib2sNV_remap_index 283
-#define VertexAttrib2svNV_remap_index 284
-#define VertexAttrib3dNV_remap_index 285
-#define VertexAttrib3dvNV_remap_index 286
-#define VertexAttrib3fNV_remap_index 287
-#define VertexAttrib3fvNV_remap_index 288
-#define VertexAttrib3sNV_remap_index 289
-#define VertexAttrib3svNV_remap_index 290
-#define VertexAttrib4dNV_remap_index 291
-#define VertexAttrib4dvNV_remap_index 292
-#define VertexAttrib4fNV_remap_index 293
-#define VertexAttrib4fvNV_remap_index 294
-#define VertexAttrib4sNV_remap_index 295
-#define VertexAttrib4svNV_remap_index 296
-#define VertexAttrib4ubNV_remap_index 297
-#define VertexAttrib4ubvNV_remap_index 298
-#define VertexAttribPointerNV_remap_index 299
-#define VertexAttribs1dvNV_remap_index 300
-#define VertexAttribs1fvNV_remap_index 301
-#define VertexAttribs1svNV_remap_index 302
-#define VertexAttribs2dvNV_remap_index 303
-#define VertexAttribs2fvNV_remap_index 304
-#define VertexAttribs2svNV_remap_index 305
-#define VertexAttribs3dvNV_remap_index 306
-#define VertexAttribs3fvNV_remap_index 307
-#define VertexAttribs3svNV_remap_index 308
-#define VertexAttribs4dvNV_remap_index 309
-#define VertexAttribs4fvNV_remap_index 310
-#define VertexAttribs4svNV_remap_index 311
-#define VertexAttribs4ubvNV_remap_index 312
-#define GetTexBumpParameterfvATI_remap_index 313
-#define GetTexBumpParameterivATI_remap_index 314
-#define TexBumpParameterfvATI_remap_index 315
-#define TexBumpParameterivATI_remap_index 316
-#define AlphaFragmentOp1ATI_remap_index 317
-#define AlphaFragmentOp2ATI_remap_index 318
-#define AlphaFragmentOp3ATI_remap_index 319
-#define BeginFragmentShaderATI_remap_index 320
-#define BindFragmentShaderATI_remap_index 321
-#define ColorFragmentOp1ATI_remap_index 322
-#define ColorFragmentOp2ATI_remap_index 323
-#define ColorFragmentOp3ATI_remap_index 324
-#define DeleteFragmentShaderATI_remap_index 325
-#define EndFragmentShaderATI_remap_index 326
-#define GenFragmentShadersATI_remap_index 327
-#define PassTexCoordATI_remap_index 328
-#define SampleMapATI_remap_index 329
-#define SetFragmentShaderConstantATI_remap_index 330
-#define PointParameteriNV_remap_index 331
-#define PointParameterivNV_remap_index 332
-#define ActiveStencilFaceEXT_remap_index 333
-#define BindVertexArrayAPPLE_remap_index 334
-#define DeleteVertexArraysAPPLE_remap_index 335
-#define GenVertexArraysAPPLE_remap_index 336
-#define IsVertexArrayAPPLE_remap_index 337
-#define GetProgramNamedParameterdvNV_remap_index 338
-#define GetProgramNamedParameterfvNV_remap_index 339
-#define ProgramNamedParameter4dNV_remap_index 340
-#define ProgramNamedParameter4dvNV_remap_index 341
-#define ProgramNamedParameter4fNV_remap_index 342
-#define ProgramNamedParameter4fvNV_remap_index 343
-#define DepthBoundsEXT_remap_index 344
-#define BlendEquationSeparateEXT_remap_index 345
-#define BindFramebufferEXT_remap_index 346
-#define BindRenderbufferEXT_remap_index 347
-#define CheckFramebufferStatusEXT_remap_index 348
-#define DeleteFramebuffersEXT_remap_index 349
-#define DeleteRenderbuffersEXT_remap_index 350
-#define FramebufferRenderbufferEXT_remap_index 351
-#define FramebufferTexture1DEXT_remap_index 352
-#define FramebufferTexture2DEXT_remap_index 353
-#define FramebufferTexture3DEXT_remap_index 354
-#define GenFramebuffersEXT_remap_index 355
-#define GenRenderbuffersEXT_remap_index 356
-#define GenerateMipmapEXT_remap_index 357
-#define GetFramebufferAttachmentParameterivEXT_remap_index 358
-#define GetRenderbufferParameterivEXT_remap_index 359
-#define IsFramebufferEXT_remap_index 360
-#define IsRenderbufferEXT_remap_index 361
-#define RenderbufferStorageEXT_remap_index 362
-#define BlitFramebufferEXT_remap_index 363
-#define FramebufferTextureLayerEXT_remap_index 364
-#define ProvokingVertexEXT_remap_index 365
-#define StencilFuncSeparateATI_remap_index 366
-#define ProgramEnvParameters4fvEXT_remap_index 367
-#define ProgramLocalParameters4fvEXT_remap_index 368
-#define GetQueryObjecti64vEXT_remap_index 369
-#define GetQueryObjectui64vEXT_remap_index 370
+#define BindVertexArray_remap_index 156
+#define GenVertexArrays_remap_index 157
+#define CopyBufferSubData_remap_index 158
+#define PolygonOffsetEXT_remap_index 159
+#define GetPixelTexGenParameterfvSGIS_remap_index 160
+#define GetPixelTexGenParameterivSGIS_remap_index 161
+#define PixelTexGenParameterfSGIS_remap_index 162
+#define PixelTexGenParameterfvSGIS_remap_index 163
+#define PixelTexGenParameteriSGIS_remap_index 164
+#define PixelTexGenParameterivSGIS_remap_index 165
+#define SampleMaskSGIS_remap_index 166
+#define SamplePatternSGIS_remap_index 167
+#define ColorPointerEXT_remap_index 168
+#define EdgeFlagPointerEXT_remap_index 169
+#define IndexPointerEXT_remap_index 170
+#define NormalPointerEXT_remap_index 171
+#define TexCoordPointerEXT_remap_index 172
+#define VertexPointerEXT_remap_index 173
+#define PointParameterfEXT_remap_index 174
+#define PointParameterfvEXT_remap_index 175
+#define LockArraysEXT_remap_index 176
+#define UnlockArraysEXT_remap_index 177
+#define CullParameterdvEXT_remap_index 178
+#define CullParameterfvEXT_remap_index 179
+#define SecondaryColor3bEXT_remap_index 180
+#define SecondaryColor3bvEXT_remap_index 181
+#define SecondaryColor3dEXT_remap_index 182
+#define SecondaryColor3dvEXT_remap_index 183
+#define SecondaryColor3fEXT_remap_index 184
+#define SecondaryColor3fvEXT_remap_index 185
+#define SecondaryColor3iEXT_remap_index 186
+#define SecondaryColor3ivEXT_remap_index 187
+#define SecondaryColor3sEXT_remap_index 188
+#define SecondaryColor3svEXT_remap_index 189
+#define SecondaryColor3ubEXT_remap_index 190
+#define SecondaryColor3ubvEXT_remap_index 191
+#define SecondaryColor3uiEXT_remap_index 192
+#define SecondaryColor3uivEXT_remap_index 193
+#define SecondaryColor3usEXT_remap_index 194
+#define SecondaryColor3usvEXT_remap_index 195
+#define SecondaryColorPointerEXT_remap_index 196
+#define MultiDrawArraysEXT_remap_index 197
+#define MultiDrawElementsEXT_remap_index 198
+#define FogCoordPointerEXT_remap_index 199
+#define FogCoorddEXT_remap_index 200
+#define FogCoorddvEXT_remap_index 201
+#define FogCoordfEXT_remap_index 202
+#define FogCoordfvEXT_remap_index 203
+#define PixelTexGenSGIX_remap_index 204
+#define BlendFuncSeparateEXT_remap_index 205
+#define FlushVertexArrayRangeNV_remap_index 206
+#define VertexArrayRangeNV_remap_index 207
+#define CombinerInputNV_remap_index 208
+#define CombinerOutputNV_remap_index 209
+#define CombinerParameterfNV_remap_index 210
+#define CombinerParameterfvNV_remap_index 211
+#define CombinerParameteriNV_remap_index 212
+#define CombinerParameterivNV_remap_index 213
+#define FinalCombinerInputNV_remap_index 214
+#define GetCombinerInputParameterfvNV_remap_index 215
+#define GetCombinerInputParameterivNV_remap_index 216
+#define GetCombinerOutputParameterfvNV_remap_index 217
+#define GetCombinerOutputParameterivNV_remap_index 218
+#define GetFinalCombinerInputParameterfvNV_remap_index 219
+#define GetFinalCombinerInputParameterivNV_remap_index 220
+#define ResizeBuffersMESA_remap_index 221
+#define WindowPos2dMESA_remap_index 222
+#define WindowPos2dvMESA_remap_index 223
+#define WindowPos2fMESA_remap_index 224
+#define WindowPos2fvMESA_remap_index 225
+#define WindowPos2iMESA_remap_index 226
+#define WindowPos2ivMESA_remap_index 227
+#define WindowPos2sMESA_remap_index 228
+#define WindowPos2svMESA_remap_index 229
+#define WindowPos3dMESA_remap_index 230
+#define WindowPos3dvMESA_remap_index 231
+#define WindowPos3fMESA_remap_index 232
+#define WindowPos3fvMESA_remap_index 233
+#define WindowPos3iMESA_remap_index 234
+#define WindowPos3ivMESA_remap_index 235
+#define WindowPos3sMESA_remap_index 236
+#define WindowPos3svMESA_remap_index 237
+#define WindowPos4dMESA_remap_index 238
+#define WindowPos4dvMESA_remap_index 239
+#define WindowPos4fMESA_remap_index 240
+#define WindowPos4fvMESA_remap_index 241
+#define WindowPos4iMESA_remap_index 242
+#define WindowPos4ivMESA_remap_index 243
+#define WindowPos4sMESA_remap_index 244
+#define WindowPos4svMESA_remap_index 245
+#define MultiModeDrawArraysIBM_remap_index 246
+#define MultiModeDrawElementsIBM_remap_index 247
+#define DeleteFencesNV_remap_index 248
+#define FinishFenceNV_remap_index 249
+#define GenFencesNV_remap_index 250
+#define GetFenceivNV_remap_index 251
+#define IsFenceNV_remap_index 252
+#define SetFenceNV_remap_index 253
+#define TestFenceNV_remap_index 254
+#define AreProgramsResidentNV_remap_index 255
+#define BindProgramNV_remap_index 256
+#define DeleteProgramsNV_remap_index 257
+#define ExecuteProgramNV_remap_index 258
+#define GenProgramsNV_remap_index 259
+#define GetProgramParameterdvNV_remap_index 260
+#define GetProgramParameterfvNV_remap_index 261
+#define GetProgramStringNV_remap_index 262
+#define GetProgramivNV_remap_index 263
+#define GetTrackMatrixivNV_remap_index 264
+#define GetVertexAttribPointervNV_remap_index 265
+#define GetVertexAttribdvNV_remap_index 266
+#define GetVertexAttribfvNV_remap_index 267
+#define GetVertexAttribivNV_remap_index 268
+#define IsProgramNV_remap_index 269
+#define LoadProgramNV_remap_index 270
+#define ProgramParameters4dvNV_remap_index 271
+#define ProgramParameters4fvNV_remap_index 272
+#define RequestResidentProgramsNV_remap_index 273
+#define TrackMatrixNV_remap_index 274
+#define VertexAttrib1dNV_remap_index 275
+#define VertexAttrib1dvNV_remap_index 276
+#define VertexAttrib1fNV_remap_index 277
+#define VertexAttrib1fvNV_remap_index 278
+#define VertexAttrib1sNV_remap_index 279
+#define VertexAttrib1svNV_remap_index 280
+#define VertexAttrib2dNV_remap_index 281
+#define VertexAttrib2dvNV_remap_index 282
+#define VertexAttrib2fNV_remap_index 283
+#define VertexAttrib2fvNV_remap_index 284
+#define VertexAttrib2sNV_remap_index 285
+#define VertexAttrib2svNV_remap_index 286
+#define VertexAttrib3dNV_remap_index 287
+#define VertexAttrib3dvNV_remap_index 288
+#define VertexAttrib3fNV_remap_index 289
+#define VertexAttrib3fvNV_remap_index 290
+#define VertexAttrib3sNV_remap_index 291
+#define VertexAttrib3svNV_remap_index 292
+#define VertexAttrib4dNV_remap_index 293
+#define VertexAttrib4dvNV_remap_index 294
+#define VertexAttrib4fNV_remap_index 295
+#define VertexAttrib4fvNV_remap_index 296
+#define VertexAttrib4sNV_remap_index 297
+#define VertexAttrib4svNV_remap_index 298
+#define VertexAttrib4ubNV_remap_index 299
+#define VertexAttrib4ubvNV_remap_index 300
+#define VertexAttribPointerNV_remap_index 301
+#define VertexAttribs1dvNV_remap_index 302
+#define VertexAttribs1fvNV_remap_index 303
+#define VertexAttribs1svNV_remap_index 304
+#define VertexAttribs2dvNV_remap_index 305
+#define VertexAttribs2fvNV_remap_index 306
+#define VertexAttribs2svNV_remap_index 307
+#define VertexAttribs3dvNV_remap_index 308
+#define VertexAttribs3fvNV_remap_index 309
+#define VertexAttribs3svNV_remap_index 310
+#define VertexAttribs4dvNV_remap_index 311
+#define VertexAttribs4fvNV_remap_index 312
+#define VertexAttribs4svNV_remap_index 313
+#define VertexAttribs4ubvNV_remap_index 314
+#define GetTexBumpParameterfvATI_remap_index 315
+#define GetTexBumpParameterivATI_remap_index 316
+#define TexBumpParameterfvATI_remap_index 317
+#define TexBumpParameterivATI_remap_index 318
+#define AlphaFragmentOp1ATI_remap_index 319
+#define AlphaFragmentOp2ATI_remap_index 320
+#define AlphaFragmentOp3ATI_remap_index 321
+#define BeginFragmentShaderATI_remap_index 322
+#define BindFragmentShaderATI_remap_index 323
+#define ColorFragmentOp1ATI_remap_index 324
+#define ColorFragmentOp2ATI_remap_index 325
+#define ColorFragmentOp3ATI_remap_index 326
+#define DeleteFragmentShaderATI_remap_index 327
+#define EndFragmentShaderATI_remap_index 328
+#define GenFragmentShadersATI_remap_index 329
+#define PassTexCoordATI_remap_index 330
+#define SampleMapATI_remap_index 331
+#define SetFragmentShaderConstantATI_remap_index 332
+#define PointParameteriNV_remap_index 333
+#define PointParameterivNV_remap_index 334
+#define ActiveStencilFaceEXT_remap_index 335
+#define BindVertexArrayAPPLE_remap_index 336
+#define DeleteVertexArraysAPPLE_remap_index 337
+#define GenVertexArraysAPPLE_remap_index 338
+#define IsVertexArrayAPPLE_remap_index 339
+#define GetProgramNamedParameterdvNV_remap_index 340
+#define GetProgramNamedParameterfvNV_remap_index 341
+#define ProgramNamedParameter4dNV_remap_index 342
+#define ProgramNamedParameter4dvNV_remap_index 343
+#define ProgramNamedParameter4fNV_remap_index 344
+#define ProgramNamedParameter4fvNV_remap_index 345
+#define DepthBoundsEXT_remap_index 346
+#define BlendEquationSeparateEXT_remap_index 347
+#define BindFramebufferEXT_remap_index 348
+#define BindRenderbufferEXT_remap_index 349
+#define CheckFramebufferStatusEXT_remap_index 350
+#define DeleteFramebuffersEXT_remap_index 351
+#define DeleteRenderbuffersEXT_remap_index 352
+#define FramebufferRenderbufferEXT_remap_index 353
+#define FramebufferTexture1DEXT_remap_index 354
+#define FramebufferTexture2DEXT_remap_index 355
+#define FramebufferTexture3DEXT_remap_index 356
+#define GenFramebuffersEXT_remap_index 357
+#define GenRenderbuffersEXT_remap_index 358
+#define GenerateMipmapEXT_remap_index 359
+#define GetFramebufferAttachmentParameterivEXT_remap_index 360
+#define GetRenderbufferParameterivEXT_remap_index 361
+#define IsFramebufferEXT_remap_index 362
+#define IsRenderbufferEXT_remap_index 363
+#define RenderbufferStorageEXT_remap_index 364
+#define BlitFramebufferEXT_remap_index 365
+#define FramebufferTextureLayerEXT_remap_index 366
+#define ProvokingVertexEXT_remap_index 367
+#define StencilFuncSeparateATI_remap_index 368
+#define ProgramEnvParameters4fvEXT_remap_index 369
+#define ProgramLocalParameters4fvEXT_remap_index 370
+#define GetQueryObjecti64vEXT_remap_index 371
+#define GetQueryObjectui64vEXT_remap_index 372

 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@ -3243,6 +3251,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_MapBufferRange(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr, GLbitfield)), driDispatchRemapTable[MapBufferRange_remap_index], parameters)
 #define GET_MapBufferRange(disp) GET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index])
 #define SET_MapBufferRange(disp, fn) SET_by_offset(disp, driDispatchRemapTable[MapBufferRange_remap_index], fn)
+#define CALL_BindVertexArray(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), driDispatchRemapTable[BindVertexArray_remap_index], parameters)
+#define GET_BindVertexArray(disp) GET_by_offset(disp, driDispatchRemapTable[BindVertexArray_remap_index])
+#define SET_BindVertexArray(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BindVertexArray_remap_index], fn)
+#define CALL_GenVertexArrays(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), driDispatchRemapTable[GenVertexArrays_remap_index], parameters)
+#define GET_GenVertexArrays(disp) GET_by_offset(disp, driDispatchRemapTable[GenVertexArrays_remap_index])
+#define SET_GenVertexArrays(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GenVertexArrays_remap_index], fn)
 #define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
 #define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
 #define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@ -7952,6 +7952,8 @@

 <xi:include href="ARB_map_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

+<xi:include href="ARB_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+

 <!-- Non-ARB extensions sorted by extension number. -->

--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@ -596,222 +596,224 @@
 #define _gloffset_RenderbufferStorageMultisample 561
 #define _gloffset_FlushMappedBufferRange 562
 #define _gloffset_MapBufferRange 563
-#define _gloffset_CopyBufferSubData 564
-#define _gloffset_PolygonOffsetEXT 565
-#define _gloffset_GetPixelTexGenParameterfvSGIS 566
-#define _gloffset_GetPixelTexGenParameterivSGIS 567
-#define _gloffset_PixelTexGenParameterfSGIS 568
-#define _gloffset_PixelTexGenParameterfvSGIS 569
-#define _gloffset_PixelTexGenParameteriSGIS 570
-#define _gloffset_PixelTexGenParameterivSGIS 571
-#define _gloffset_SampleMaskSGIS 572
-#define _gloffset_SamplePatternSGIS 573
-#define _gloffset_ColorPointerEXT 574
-#define _gloffset_EdgeFlagPointerEXT 575
-#define _gloffset_IndexPointerEXT 576
-#define _gloffset_NormalPointerEXT 577
-#define _gloffset_TexCoordPointerEXT 578
-#define _gloffset_VertexPointerEXT 579
-#define _gloffset_PointParameterfEXT 580
-#define _gloffset_PointParameterfvEXT 581
-#define _gloffset_LockArraysEXT 582
-#define _gloffset_UnlockArraysEXT 583
-#define _gloffset_CullParameterdvEXT 584
-#define _gloffset_CullParameterfvEXT 585
-#define _gloffset_SecondaryColor3bEXT 586
-#define _gloffset_SecondaryColor3bvEXT 587
-#define _gloffset_SecondaryColor3dEXT 588
-#define _gloffset_SecondaryColor3dvEXT 589
-#define _gloffset_SecondaryColor3fEXT 590
-#define _gloffset_SecondaryColor3fvEXT 591
-#define _gloffset_SecondaryColor3iEXT 592
-#define _gloffset_SecondaryColor3ivEXT 593
-#define _gloffset_SecondaryColor3sEXT 594
-#define _gloffset_SecondaryColor3svEXT 595
-#define _gloffset_SecondaryColor3ubEXT 596
-#define _gloffset_SecondaryColor3ubvEXT 597
-#define _gloffset_SecondaryColor3uiEXT 598
-#define _gloffset_SecondaryColor3uivEXT 599
-#define _gloffset_SecondaryColor3usEXT 600
-#define _gloffset_SecondaryColor3usvEXT 601
-#define _gloffset_SecondaryColorPointerEXT 602
-#define _gloffset_MultiDrawArraysEXT 603
-#define _gloffset_MultiDrawElementsEXT 604
-#define _gloffset_FogCoordPointerEXT 605
-#define _gloffset_FogCoorddEXT 606
-#define _gloffset_FogCoorddvEXT 607
-#define _gloffset_FogCoordfEXT 608
-#define _gloffset_FogCoordfvEXT 609
-#define _gloffset_PixelTexGenSGIX 610
-#define _gloffset_BlendFuncSeparateEXT 611
-#define _gloffset_FlushVertexArrayRangeNV 612
-#define _gloffset_VertexArrayRangeNV 613
-#define _gloffset_CombinerInputNV 614
-#define _gloffset_CombinerOutputNV 615
-#define _gloffset_CombinerParameterfNV 616
-#define _gloffset_CombinerParameterfvNV 617
-#define _gloffset_CombinerParameteriNV 618
-#define _gloffset_CombinerParameterivNV 619
-#define _gloffset_FinalCombinerInputNV 620
-#define _gloffset_GetCombinerInputParameterfvNV 621
-#define _gloffset_GetCombinerInputParameterivNV 622
-#define _gloffset_GetCombinerOutputParameterfvNV 623
-#define _gloffset_GetCombinerOutputParameterivNV 624
-#define _gloffset_GetFinalCombinerInputParameterfvNV 625
-#define _gloffset_GetFinalCombinerInputParameterivNV 626
-#define _gloffset_ResizeBuffersMESA 627
-#define _gloffset_WindowPos2dMESA 628
-#define _gloffset_WindowPos2dvMESA 629
-#define _gloffset_WindowPos2fMESA 630
-#define _gloffset_WindowPos2fvMESA 631
-#define _gloffset_WindowPos2iMESA 632
-#define _gloffset_WindowPos2ivMESA 633
-#define _gloffset_WindowPos2sMESA 634
-#define _gloffset_WindowPos2svMESA 635
-#define _gloffset_WindowPos3dMESA 636
-#define _gloffset_WindowPos3dvMESA 637
-#define _gloffset_WindowPos3fMESA 638
-#define _gloffset_WindowPos3fvMESA 639
-#define _gloffset_WindowPos3iMESA 640
-#define _gloffset_WindowPos3ivMESA 641
-#define _gloffset_WindowPos3sMESA 642
-#define _gloffset_WindowPos3svMESA 643
-#define _gloffset_WindowPos4dMESA 644
-#define _gloffset_WindowPos4dvMESA 645
-#define _gloffset_WindowPos4fMESA 646
-#define _gloffset_WindowPos4fvMESA 647
-#define _gloffset_WindowPos4iMESA 648
-#define _gloffset_WindowPos4ivMESA 649
-#define _gloffset_WindowPos4sMESA 650
-#define _gloffset_WindowPos4svMESA 651
-#define _gloffset_MultiModeDrawArraysIBM 652
-#define _gloffset_MultiModeDrawElementsIBM 653
-#define _gloffset_DeleteFencesNV 654
-#define _gloffset_FinishFenceNV 655
-#define _gloffset_GenFencesNV 656
-#define _gloffset_GetFenceivNV 657
-#define _gloffset_IsFenceNV 658
-#define _gloffset_SetFenceNV 659
-#define _gloffset_TestFenceNV 660
-#define _gloffset_AreProgramsResidentNV 661
-#define _gloffset_BindProgramNV 662
-#define _gloffset_DeleteProgramsNV 663
-#define _gloffset_ExecuteProgramNV 664
-#define _gloffset_GenProgramsNV 665
-#define _gloffset_GetProgramParameterdvNV 666
-#define _gloffset_GetProgramParameterfvNV 667
-#define _gloffset_GetProgramStringNV 668
-#define _gloffset_GetProgramivNV 669
-#define _gloffset_GetTrackMatrixivNV 670
-#define _gloffset_GetVertexAttribPointervNV 671
-#define _gloffset_GetVertexAttribdvNV 672
-#define _gloffset_GetVertexAttribfvNV 673
-#define _gloffset_GetVertexAttribivNV 674
-#define _gloffset_IsProgramNV 675
-#define _gloffset_LoadProgramNV 676
-#define _gloffset_ProgramParameters4dvNV 677
-#define _gloffset_ProgramParameters4fvNV 678
-#define _gloffset_RequestResidentProgramsNV 679
-#define _gloffset_TrackMatrixNV 680
-#define _gloffset_VertexAttrib1dNV 681
-#define _gloffset_VertexAttrib1dvNV 682
-#define _gloffset_VertexAttrib1fNV 683
-#define _gloffset_VertexAttrib1fvNV 684
-#define _gloffset_VertexAttrib1sNV 685
-#define _gloffset_VertexAttrib1svNV 686
-#define _gloffset_VertexAttrib2dNV 687
-#define _gloffset_VertexAttrib2dvNV 688
-#define _gloffset_VertexAttrib2fNV 689
-#define _gloffset_VertexAttrib2fvNV 690
-#define _gloffset_VertexAttrib2sNV 691
-#define _gloffset_VertexAttrib2svNV 692
-#define _gloffset_VertexAttrib3dNV 693
-#define _gloffset_VertexAttrib3dvNV 694
-#define _gloffset_VertexAttrib3fNV 695
-#define _gloffset_VertexAttrib3fvNV 696
-#define _gloffset_VertexAttrib3sNV 697
-#define _gloffset_VertexAttrib3svNV 698
-#define _gloffset_VertexAttrib4dNV 699
-#define _gloffset_VertexAttrib4dvNV 700
-#define _gloffset_VertexAttrib4fNV 701
-#define _gloffset_VertexAttrib4fvNV 702
-#define _gloffset_VertexAttrib4sNV 703
-#define _gloffset_VertexAttrib4svNV 704
-#define _gloffset_VertexAttrib4ubNV 705
-#define _gloffset_VertexAttrib4ubvNV 706
-#define _gloffset_VertexAttribPointerNV 707
-#define _gloffset_VertexAttribs1dvNV 708
-#define _gloffset_VertexAttribs1fvNV 709
-#define _gloffset_VertexAttribs1svNV 710
-#define _gloffset_VertexAttribs2dvNV 711
-#define _gloffset_VertexAttribs2fvNV 712
-#define _gloffset_VertexAttribs2svNV 713
-#define _gloffset_VertexAttribs3dvNV 714
-#define _gloffset_VertexAttribs3fvNV 715
-#define _gloffset_VertexAttribs3svNV 716
-#define _gloffset_VertexAttribs4dvNV 717
-#define _gloffset_VertexAttribs4fvNV 718
-#define _gloffset_VertexAttribs4svNV 719
-#define _gloffset_VertexAttribs4ubvNV 720
-#define _gloffset_GetTexBumpParameterfvATI 721
-#define _gloffset_GetTexBumpParameterivATI 722
-#define _gloffset_TexBumpParameterfvATI 723
-#define _gloffset_TexBumpParameterivATI 724
-#define _gloffset_AlphaFragmentOp1ATI 725
-#define _gloffset_AlphaFragmentOp2ATI 726
-#define _gloffset_AlphaFragmentOp3ATI 727
-#define _gloffset_BeginFragmentShaderATI 728
-#define _gloffset_BindFragmentShaderATI 729
-#define _gloffset_ColorFragmentOp1ATI 730
-#define _gloffset_ColorFragmentOp2ATI 731
-#define _gloffset_ColorFragmentOp3ATI 732
-#define _gloffset_DeleteFragmentShaderATI 733
-#define _gloffset_EndFragmentShaderATI 734
-#define _gloffset_GenFragmentShadersATI 735
-#define _gloffset_PassTexCoordATI 736
-#define _gloffset_SampleMapATI 737
-#define _gloffset_SetFragmentShaderConstantATI 738
-#define _gloffset_PointParameteriNV 739
-#define _gloffset_PointParameterivNV 740
-#define _gloffset_ActiveStencilFaceEXT 741
-#define _gloffset_BindVertexArrayAPPLE 742
-#define _gloffset_DeleteVertexArraysAPPLE 743
-#define _gloffset_GenVertexArraysAPPLE 744
-#define _gloffset_IsVertexArrayAPPLE 745
-#define _gloffset_GetProgramNamedParameterdvNV 746
-#define _gloffset_GetProgramNamedParameterfvNV 747
-#define _gloffset_ProgramNamedParameter4dNV 748
-#define _gloffset_ProgramNamedParameter4dvNV 749
-#define _gloffset_ProgramNamedParameter4fNV 750
-#define _gloffset_ProgramNamedParameter4fvNV 751
-#define _gloffset_DepthBoundsEXT 752
-#define _gloffset_BlendEquationSeparateEXT 753
-#define _gloffset_BindFramebufferEXT 754
-#define _gloffset_BindRenderbufferEXT 755
-#define _gloffset_CheckFramebufferStatusEXT 756
-#define _gloffset_DeleteFramebuffersEXT 757
-#define _gloffset_DeleteRenderbuffersEXT 758
-#define _gloffset_FramebufferRenderbufferEXT 759
-#define _gloffset_FramebufferTexture1DEXT 760
-#define _gloffset_FramebufferTexture2DEXT 761
-#define _gloffset_FramebufferTexture3DEXT 762
-#define _gloffset_GenFramebuffersEXT 763
-#define _gloffset_GenRenderbuffersEXT 764
-#define _gloffset_GenerateMipmapEXT 765
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 766
-#define _gloffset_GetRenderbufferParameterivEXT 767
-#define _gloffset_IsFramebufferEXT 768
-#define _gloffset_IsRenderbufferEXT 769
-#define _gloffset_RenderbufferStorageEXT 770
-#define _gloffset_BlitFramebufferEXT 771
-#define _gloffset_FramebufferTextureLayerEXT 772
-#define _gloffset_ProvokingVertexEXT 773
-#define _gloffset_StencilFuncSeparateATI 774
-#define _gloffset_ProgramEnvParameters4fvEXT 775
-#define _gloffset_ProgramLocalParameters4fvEXT 776
-#define _gloffset_GetQueryObjecti64vEXT 777
-#define _gloffset_GetQueryObjectui64vEXT 778
-#define _gloffset_FIRST_DYNAMIC 779
+#define _gloffset_BindVertexArray 564
+#define _gloffset_GenVertexArrays 565
+#define _gloffset_CopyBufferSubData 566
+#define _gloffset_PolygonOffsetEXT 567
+#define _gloffset_GetPixelTexGenParameterfvSGIS 568
+#define _gloffset_GetPixelTexGenParameterivSGIS 569
+#define _gloffset_PixelTexGenParameterfSGIS 570
+#define _gloffset_PixelTexGenParameterfvSGIS 571
+#define _gloffset_PixelTexGenParameteriSGIS 572
+#define _gloffset_PixelTexGenParameterivSGIS 573
+#define _gloffset_SampleMaskSGIS 574
+#define _gloffset_SamplePatternSGIS 575
+#define _gloffset_ColorPointerEXT 576
+#define _gloffset_EdgeFlagPointerEXT 577
+#define _gloffset_IndexPointerEXT 578
+#define _gloffset_NormalPointerEXT 579
+#define _gloffset_TexCoordPointerEXT 580
+#define _gloffset_VertexPointerEXT 581
+#define _gloffset_PointParameterfEXT 582
+#define _gloffset_PointParameterfvEXT 583
+#define _gloffset_LockArraysEXT 584
+#define _gloffset_UnlockArraysEXT 585
+#define _gloffset_CullParameterdvEXT 586
+#define _gloffset_CullParameterfvEXT 587
+#define _gloffset_SecondaryColor3bEXT 588
+#define _gloffset_SecondaryColor3bvEXT 589
+#define _gloffset_SecondaryColor3dEXT 590
+#define _gloffset_SecondaryColor3dvEXT 591
+#define _gloffset_SecondaryColor3fEXT 592
+#define _gloffset_SecondaryColor3fvEXT 593
+#define _gloffset_SecondaryColor3iEXT 594
+#define _gloffset_SecondaryColor3ivEXT 595
+#define _gloffset_SecondaryColor3sEXT 596
+#define _gloffset_SecondaryColor3svEXT 597
+#define _gloffset_SecondaryColor3ubEXT 598
+#define _gloffset_SecondaryColor3ubvEXT 599
+#define _gloffset_SecondaryColor3uiEXT 600
+#define _gloffset_SecondaryColor3uivEXT 601
+#define _gloffset_SecondaryColor3usEXT 602
+#define _gloffset_SecondaryColor3usvEXT 603
+#define _gloffset_SecondaryColorPointerEXT 604
+#define _gloffset_MultiDrawArraysEXT 605
+#define _gloffset_MultiDrawElementsEXT 606
+#define _gloffset_FogCoordPointerEXT 607
+#define _gloffset_FogCoorddEXT 608
+#define _gloffset_FogCoorddvEXT 609
+#define _gloffset_FogCoordfEXT 610
+#define _gloffset_FogCoordfvEXT 611
+#define _gloffset_PixelTexGenSGIX 612
+#define _gloffset_BlendFuncSeparateEXT 613
+#define _gloffset_FlushVertexArrayRangeNV 614
+#define _gloffset_VertexArrayRangeNV 615
+#define _gloffset_CombinerInputNV 616
+#define _gloffset_CombinerOutputNV 617
+#define _gloffset_CombinerParameterfNV 618
+#define _gloffset_CombinerParameterfvNV 619
+#define _gloffset_CombinerParameteriNV 620
+#define _gloffset_CombinerParameterivNV 621
+#define _gloffset_FinalCombinerInputNV 622
+#define _gloffset_GetCombinerInputParameterfvNV 623
+#define _gloffset_GetCombinerInputParameterivNV 624
+#define _gloffset_GetCombinerOutputParameterfvNV 625
+#define _gloffset_GetCombinerOutputParameterivNV 626
+#define _gloffset_GetFinalCombinerInputParameterfvNV 627
+#define _gloffset_GetFinalCombinerInputParameterivNV 628
+#define _gloffset_ResizeBuffersMESA 629
+#define _gloffset_WindowPos2dMESA 630
+#define _gloffset_WindowPos2dvMESA 631
+#define _gloffset_WindowPos2fMESA 632
+#define _gloffset_WindowPos2fvMESA 633
+#define _gloffset_WindowPos2iMESA 634
+#define _gloffset_WindowPos2ivMESA 635
+#define _gloffset_WindowPos2sMESA 636
+#define _gloffset_WindowPos2svMESA 637
+#define _gloffset_WindowPos3dMESA 638
+#define _gloffset_WindowPos3dvMESA 639
+#define _gloffset_WindowPos3fMESA 640
+#define _gloffset_WindowPos3fvMESA 641
+#define _gloffset_WindowPos3iMESA 642
+#define _gloffset_WindowPos3ivMESA 643
+#define _gloffset_WindowPos3sMESA 644
+#define _gloffset_WindowPos3svMESA 645
+#define _gloffset_WindowPos4dMESA 646
+#define _gloffset_WindowPos4dvMESA 647
+#define _gloffset_WindowPos4fMESA 648
+#define _gloffset_WindowPos4fvMESA 649
+#define _gloffset_WindowPos4iMESA 650
+#define _gloffset_WindowPos4ivMESA 651
+#define _gloffset_WindowPos4sMESA 652
+#define _gloffset_WindowPos4svMESA 653
+#define _gloffset_MultiModeDrawArraysIBM 654
+#define _gloffset_MultiModeDrawElementsIBM 655
+#define _gloffset_DeleteFencesNV 656
+#define _gloffset_FinishFenceNV 657
+#define _gloffset_GenFencesNV 658
+#define _gloffset_GetFenceivNV 659
+#define _gloffset_IsFenceNV 660
+#define _gloffset_SetFenceNV 661
+#define _gloffset_TestFenceNV 662
+#define _gloffset_AreProgramsResidentNV 663
+#define _gloffset_BindProgramNV 664
+#define _gloffset_DeleteProgramsNV 665
+#define _gloffset_ExecuteProgramNV 666
+#define _gloffset_GenProgramsNV 667
+#define _gloffset_GetProgramParameterdvNV 668
+#define _gloffset_GetProgramParameterfvNV 669
+#define _gloffset_GetProgramStringNV 670
+#define _gloffset_GetProgramivNV 671
+#define _gloffset_GetTrackMatrixivNV 672
+#define _gloffset_GetVertexAttribPointervNV 673
+#define _gloffset_GetVertexAttribdvNV 674
+#define _gloffset_GetVertexAttribfvNV 675
+#define _gloffset_GetVertexAttribivNV 676
+#define _gloffset_IsProgramNV 677
+#define _gloffset_LoadProgramNV 678
+#define _gloffset_ProgramParameters4dvNV 679
+#define _gloffset_ProgramParameters4fvNV 680
+#define _gloffset_RequestResidentProgramsNV 681
+#define _gloffset_TrackMatrixNV 682
+#define _gloffset_VertexAttrib1dNV 683
+#define _gloffset_VertexAttrib1dvNV 684
+#define _gloffset_VertexAttrib1fNV 685
+#define _gloffset_VertexAttrib1fvNV 686
+#define _gloffset_VertexAttrib1sNV 687
+#define _gloffset_VertexAttrib1svNV 688
+#define _gloffset_VertexAttrib2dNV 689
+#define _gloffset_VertexAttrib2dvNV 690
+#define _gloffset_VertexAttrib2fNV 691
+#define _gloffset_VertexAttrib2fvNV 692
+#define _gloffset_VertexAttrib2sNV 693
+#define _gloffset_VertexAttrib2svNV 694
+#define _gloffset_VertexAttrib3dNV 695
+#define _gloffset_VertexAttrib3dvNV 696
+#define _gloffset_VertexAttrib3fNV 697
+#define _gloffset_VertexAttrib3fvNV 698
+#define _gloffset_VertexAttrib3sNV 699
+#define _gloffset_VertexAttrib3svNV 700
+#define _gloffset_VertexAttrib4dNV 701
+#define _gloffset_VertexAttrib4dvNV 702
+#define _gloffset_VertexAttrib4fNV 703
+#define _gloffset_VertexAttrib4fvNV 704
+#define _gloffset_VertexAttrib4sNV 705
+#define _gloffset_VertexAttrib4svNV 706
+#define _gloffset_VertexAttrib4ubNV 707
+#define _gloffset_VertexAttrib4ubvNV 708
+#define _gloffset_VertexAttribPointerNV 709
+#define _gloffset_VertexAttribs1dvNV 710
+#define _gloffset_VertexAttribs1fvNV 711
+#define _gloffset_VertexAttribs1svNV 712
+#define _gloffset_VertexAttribs2dvNV 713
+#define _gloffset_VertexAttribs2fvNV 714
+#define _gloffset_VertexAttribs2svNV 715
+#define _gloffset_VertexAttribs3dvNV 716
+#define _gloffset_VertexAttribs3fvNV 717
+#define _gloffset_VertexAttribs3svNV 718
+#define _gloffset_VertexAttribs4dvNV 719
+#define _gloffset_VertexAttribs4fvNV 720
+#define _gloffset_VertexAttribs4svNV 721
+#define _gloffset_VertexAttribs4ubvNV 722
+#define _gloffset_GetTexBumpParameterfvATI 723
+#define _gloffset_GetTexBumpParameterivATI 724
+#define _gloffset_TexBumpParameterfvATI 725
+#define _gloffset_TexBumpParameterivATI 726
+#define _gloffset_AlphaFragmentOp1ATI 727
+#define _gloffset_AlphaFragmentOp2ATI 728
+#define _gloffset_AlphaFragmentOp3ATI 729
+#define _gloffset_BeginFragmentShaderATI 730
+#define _gloffset_BindFragmentShaderATI 731
+#define _gloffset_ColorFragmentOp1ATI 732
+#define _gloffset_ColorFragmentOp2ATI 733
+#define _gloffset_ColorFragmentOp3ATI 734
+#define _gloffset_DeleteFragmentShaderATI 735
+#define _gloffset_EndFragmentShaderATI 736
+#define _gloffset_GenFragmentShadersATI 737
+#define _gloffset_PassTexCoordATI 738
+#define _gloffset_SampleMapATI 739
+#define _gloffset_SetFragmentShaderConstantATI 740
+#define _gloffset_PointParameteriNV 741
+#define _gloffset_PointParameterivNV 742
+#define _gloffset_ActiveStencilFaceEXT 743
+#define _gloffset_BindVertexArrayAPPLE 744
+#define _gloffset_DeleteVertexArraysAPPLE 745
+#define _gloffset_GenVertexArraysAPPLE 746
+#define _gloffset_IsVertexArrayAPPLE 747
+#define _gloffset_GetProgramNamedParameterdvNV 748
+#define _gloffset_GetProgramNamedParameterfvNV 749
+#define _gloffset_ProgramNamedParameter4dNV 750
+#define _gloffset_ProgramNamedParameter4dvNV 751
+#define _gloffset_ProgramNamedParameter4fNV 752
+#define _gloffset_ProgramNamedParameter4fvNV 753
+#define _gloffset_DepthBoundsEXT 754
+#define _gloffset_BlendEquationSeparateEXT 755
+#define _gloffset_BindFramebufferEXT 756
+#define _gloffset_BindRenderbufferEXT 757
+#define _gloffset_CheckFramebufferStatusEXT 758
+#define _gloffset_DeleteFramebuffersEXT 759
+#define _gloffset_DeleteRenderbuffersEXT 760
+#define _gloffset_FramebufferRenderbufferEXT 761
+#define _gloffset_FramebufferTexture1DEXT 762
+#define _gloffset_FramebufferTexture2DEXT 763
+#define _gloffset_FramebufferTexture3DEXT 764
+#define _gloffset_GenFramebuffersEXT 765
+#define _gloffset_GenRenderbuffersEXT 766
+#define _gloffset_GenerateMipmapEXT 767
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 768
+#define _gloffset_GetRenderbufferParameterivEXT 769
+#define _gloffset_IsFramebufferEXT 770
+#define _gloffset_IsRenderbufferEXT 771
+#define _gloffset_RenderbufferStorageEXT 772
+#define _gloffset_BlitFramebufferEXT 773
+#define _gloffset_FramebufferTextureLayerEXT 774
+#define _gloffset_ProvokingVertexEXT 775
+#define _gloffset_StencilFuncSeparateATI 776
+#define _gloffset_ProgramEnvParameters4fvEXT 777
+#define _gloffset_ProgramLocalParameters4fvEXT 778
+#define _gloffset_GetQueryObjecti64vEXT 779
+#define _gloffset_GetQueryObjectui64vEXT 780
+#define _gloffset_FIRST_DYNAMIC 781

 #else

@ -971,6 +973,8 @@
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
 #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
 #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
+#define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
+#define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@ -604,221 +604,223 @@ struct _glapi_table
   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 561 */
   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 562 */
   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 563 */
-   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 564 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 565 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 566 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 567 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 568 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 569 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 570 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 571 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 572 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 573 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 575 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 577 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 580 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 581 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 582 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 583 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 584 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 585 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 586 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 598 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 599 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 600 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 601 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 603 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 604 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 605 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 606 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 607 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 608 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 609 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 610 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 611 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 612 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 613 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 614 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 615 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 616 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 617 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 618 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 619 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 620 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 621 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 622 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 623 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 624 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 625 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 626 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 627 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 628 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 629 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 630 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 631 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 632 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 633 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 634 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 635 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 636 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 638 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 639 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 640 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 641 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 642 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 643 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 644 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 646 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 647 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 648 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 649 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 650 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 651 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 652 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 653 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 654 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 655 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 656 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 657 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 658 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 659 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 660 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 661 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 662 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 663 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 664 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 665 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 666 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 667 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 668 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 669 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 670 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 671 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 672 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 673 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 674 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 675 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 676 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 677 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 678 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 679 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 680 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 681 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 683 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 685 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 687 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 689 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 691 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 693 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 695 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 697 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 699 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 703 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 704 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 705 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 706 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 707 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 709 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 717 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 718 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 719 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 720 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 721 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 722 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 723 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 724 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 725 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 726 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 727 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 728 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 729 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 730 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 731 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 732 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 733 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 734 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 735 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 736 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 737 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 738 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 739 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 740 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 741 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 742 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 743 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 744 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 745 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 746 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 747 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 748 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 749 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 750 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 751 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 752 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 753 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 754 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 755 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 756 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 757 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 758 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 759 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 760 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 761 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 762 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 763 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 764 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 765 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 766 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 767 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 768 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 769 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 770 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 771 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 772 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 773 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 774 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 775 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 776 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 777 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 778 */
+   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 564 */
+   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 565 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 566 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 567 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 568 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 569 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 570 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 571 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 572 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 573 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 574 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 575 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 577 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 580 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 581 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 582 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 583 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 584 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 585 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 586 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 587 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 588 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 589 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 590 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 591 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 592 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 593 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 599 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 600 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 601 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 602 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 603 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 604 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 605 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 606 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 607 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 608 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 609 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 610 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 611 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 612 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 613 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 614 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 615 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 617 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 618 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 619 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 620 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 621 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 622 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 623 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 624 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 625 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 626 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 627 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 628 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 629 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 630 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 631 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 632 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 633 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 634 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 635 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 636 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 637 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 638 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 639 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 640 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 641 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 642 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 643 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 644 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 645 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 646 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 647 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 648 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 649 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 650 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 651 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 652 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 653 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 654 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 655 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 656 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 657 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 658 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 659 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 660 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 661 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 662 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 663 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 664 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 665 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 666 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 667 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 668 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 669 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 670 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 671 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 672 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 673 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 674 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 675 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 676 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 677 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 678 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 679 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 680 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 681 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 682 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 683 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 684 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 685 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 686 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 687 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 688 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 689 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 690 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 691 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 692 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 693 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 694 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 695 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 696 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 697 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 698 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 699 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 700 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 701 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 702 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 703 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 704 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 705 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 706 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 707 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 708 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 709 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 716 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 718 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 719 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 720 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 721 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 722 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 723 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 724 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 725 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 726 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 730 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 731 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 732 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 733 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 734 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 735 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 736 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 737 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 738 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 739 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 740 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 741 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 742 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 743 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 744 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 745 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 746 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 747 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 748 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 749 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 750 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 751 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 752 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 753 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 754 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 755 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 756 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 757 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 758 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 759 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 760 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 761 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 762 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 763 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 764 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 765 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 766 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 767 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 768 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 769 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 770 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 771 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 772 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 773 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 774 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 775 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 776 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 777 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 778 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 779 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 780 */
 };

 #endif /* !defined( _GLAPI_TABLE_H_ ) */
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@ -4021,6 +4021,16 @@ KEYWORD1 GLvoid * KEYWORD2 NAME(MapBufferRange)(GLenum target, GLintptr offset,
   RETURN_DISPATCH(MapBufferRange, (target, offset, length, access), (F, "glMapBufferRange(0x%x, %d, %d, %d);\n", target, offset, length, access));
 }

+KEYWORD1 void KEYWORD2 NAME(BindVertexArray)(GLuint array)
+{
+   DISPATCH(BindVertexArray, (array), (F, "glBindVertexArray(%d);\n", array));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenVertexArrays)(GLsizei n, GLuint * arrays)
+{
+   DISPATCH(GenVertexArrays, (n, arrays), (F, "glGenVertexArrays(%d, %p);\n", n, (const void *) arrays));
+}
+
 KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
   DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
@ -4031,58 +4041,58 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
   DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_566)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params)
 {
   DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_567)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params)
 {
   DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param)
 {
   DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params)
 {
   DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param)
 {
   DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params)
 {
   DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert)
 {
   DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern)
 {
   DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@ -4132,9 +4142,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param)
 {
   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@ -4154,9 +4164,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params)
 {
   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@ -4171,16 +4181,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
   DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_584)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params)
 {
   DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_585)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params)
 {
   DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@ -4425,9 +4435,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_610)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode)
 {
   DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@ -4442,9 +4452,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_611)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@ -4809,65 +4819,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
   DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_652)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
   DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_653)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
   DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences)
 {
   DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
 {
   DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences)
 {
   DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params)
 {
   DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }

-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence);
-
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_658)(GLuint fence)
-{
-   RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
-}
-
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition);
-
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum condition)
-{
-   DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
-}
-
 KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);

 KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
+{
+   RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition)
+{
+   DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
+}
+
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence);
+
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence)
 {
   RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@ -5312,37 +5322,47 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
   DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face)
 {
   DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_742)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array)
 {
   DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays);
+KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays)
+{
+   DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
+}

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays);
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays)
 {
   DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays)
 {
   DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }

-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array);
+KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
+{
+   RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
+}

-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_745)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array);
+
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array)
 {
   RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@ -5377,9 +5397,9 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
   DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax)
 {
   DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@ -5389,9 +5409,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
   DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA)
 {
   DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@ -5571,9 +5591,9 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
   DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_771)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_773)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
   DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
@ -5593,37 +5613,37 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
   DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
   DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
   DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
   DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint id, GLenum pname, GLint64EXT * params)
 {
   DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params);

-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
   DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@ -6206,16 +6226,18 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(RenderbufferStorageMultisample),
   TABLE_ENTRY(FlushMappedBufferRange),
   TABLE_ENTRY(MapBufferRange),
+   TABLE_ENTRY(BindVertexArray),
+   TABLE_ENTRY(GenVertexArrays),
   TABLE_ENTRY(CopyBufferSubData),
   TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_566),
-   TABLE_ENTRY(_dispatch_stub_567),
   TABLE_ENTRY(_dispatch_stub_568),
   TABLE_ENTRY(_dispatch_stub_569),
   TABLE_ENTRY(_dispatch_stub_570),
   TABLE_ENTRY(_dispatch_stub_571),
   TABLE_ENTRY(_dispatch_stub_572),
   TABLE_ENTRY(_dispatch_stub_573),
+   TABLE_ENTRY(_dispatch_stub_574),
+   TABLE_ENTRY(_dispatch_stub_575),
   TABLE_ENTRY(ColorPointerEXT),
   TABLE_ENTRY(EdgeFlagPointerEXT),
   TABLE_ENTRY(IndexPointerEXT),
@ -6226,8 +6248,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(PointParameterfvEXT),
   TABLE_ENTRY(LockArraysEXT),
   TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_584),
-   TABLE_ENTRY(_dispatch_stub_585),
+   TABLE_ENTRY(_dispatch_stub_586),
+   TABLE_ENTRY(_dispatch_stub_587),
   TABLE_ENTRY(SecondaryColor3bEXT),
   TABLE_ENTRY(SecondaryColor3bvEXT),
   TABLE_ENTRY(SecondaryColor3dEXT),
@ -6252,7 +6274,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(FogCoorddvEXT),
   TABLE_ENTRY(FogCoordfEXT),
   TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_610),
+   TABLE_ENTRY(_dispatch_stub_612),
   TABLE_ENTRY(BlendFuncSeparateEXT),
   TABLE_ENTRY(FlushVertexArrayRangeNV),
   TABLE_ENTRY(VertexArrayRangeNV),
@ -6294,8 +6316,6 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(WindowPos4ivMESA),
   TABLE_ENTRY(WindowPos4sMESA),
   TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_652),
-   TABLE_ENTRY(_dispatch_stub_653),
   TABLE_ENTRY(_dispatch_stub_654),
   TABLE_ENTRY(_dispatch_stub_655),
   TABLE_ENTRY(_dispatch_stub_656),
@ -6303,6 +6323,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(_dispatch_stub_658),
   TABLE_ENTRY(_dispatch_stub_659),
   TABLE_ENTRY(_dispatch_stub_660),
+   TABLE_ENTRY(_dispatch_stub_661),
+   TABLE_ENTRY(_dispatch_stub_662),
   TABLE_ENTRY(AreProgramsResidentNV),
   TABLE_ENTRY(BindProgramNV),
   TABLE_ENTRY(DeleteProgramsNV),
@ -6383,19 +6405,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(SetFragmentShaderConstantATI),
   TABLE_ENTRY(PointParameteriNV),
   TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_741),
-   TABLE_ENTRY(_dispatch_stub_742),
   TABLE_ENTRY(_dispatch_stub_743),
   TABLE_ENTRY(_dispatch_stub_744),
   TABLE_ENTRY(_dispatch_stub_745),
+   TABLE_ENTRY(_dispatch_stub_746),
+   TABLE_ENTRY(_dispatch_stub_747),
   TABLE_ENTRY(GetProgramNamedParameterdvNV),
   TABLE_ENTRY(GetProgramNamedParameterfvNV),
   TABLE_ENTRY(ProgramNamedParameter4dNV),
   TABLE_ENTRY(ProgramNamedParameter4dvNV),
   TABLE_ENTRY(ProgramNamedParameter4fNV),
   TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_752),
-   TABLE_ENTRY(_dispatch_stub_753),
+   TABLE_ENTRY(_dispatch_stub_754),
+   TABLE_ENTRY(_dispatch_stub_755),
   TABLE_ENTRY(BindFramebufferEXT),
   TABLE_ENTRY(BindRenderbufferEXT),
   TABLE_ENTRY(CheckFramebufferStatusEXT),
@ -6413,14 +6435,14 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
   TABLE_ENTRY(IsFramebufferEXT),
   TABLE_ENTRY(IsRenderbufferEXT),
   TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_771),
+   TABLE_ENTRY(_dispatch_stub_773),
   TABLE_ENTRY(FramebufferTextureLayerEXT),
   TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_774),
-   TABLE_ENTRY(_dispatch_stub_775),
   TABLE_ENTRY(_dispatch_stub_776),
   TABLE_ENTRY(_dispatch_stub_777),
   TABLE_ENTRY(_dispatch_stub_778),
+   TABLE_ENTRY(_dispatch_stub_779),
+   TABLE_ENTRY(_dispatch_stub_780),
   /* A whole bunch of no-op functions.  These might be called
    * when someone tries to call a dynamically-registered
    * extension function without a current rendering context.
@ -6787,6 +6809,8 @@ static _glapi_proc UNUSED_TABLE_NAME[] = {
   TABLE_ENTRY(IsProgramARB),
   TABLE_ENTRY(PointParameteri),
   TABLE_ENTRY(PointParameteriv),
+   TABLE_ENTRY(DeleteVertexArrays),
+   TABLE_ENTRY(IsVertexArray),
   TABLE_ENTRY(BlendEquationSeparate),
   TABLE_ENTRY(BindFramebuffer),
   TABLE_ENTRY(BindRenderbuffer),
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@ -904,4 +904,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)

   /* GL_ARB_copy_buffer */
   SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
+
+   /* GL_ARB_vertex_array_object */
+   SET_BindVertexArray(exec, _mesa_BindVertexArray);
+   SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
 }
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@ -63,10 +63,11 @@
 static INLINE struct gl_array_object *
 lookup_arrayobj(GLcontext *ctx, GLuint id)
 {
-   return (id == 0) 
-     ? NULL 
-     : (struct gl_array_object *) _mesa_HashLookup(ctx->Shared->ArrayObjects,
-						   id);
+   if (id == 0)
+      return NULL;
+   else
+      return (struct gl_array_object *)
+         _mesa_HashLookup(ctx->Array.Objects, id);
 }


@ -252,7 +253,7 @@ save_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
   if (obj->Name > 0) {
      /* insert into hash table */
-      _mesa_HashInsert(ctx->Shared->ArrayObjects, obj->Name, obj);
+      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);
   }
 }

@ -266,7 +267,7 @@ remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
 {
   if (obj->Name > 0) {
      /* remove from hash table */
-      _mesa_HashRemove(ctx->Shared->ArrayObjects, obj->Name);
+      _mesa_HashRemove(ctx->Array.Objects, obj->Name);
   }
 }

@ -352,18 +353,15 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
 /* API Functions                                                      */
 /**********************************************************************/

+
 /**
- * Bind a new array.
- *
- * \todo
- * The binding could be done more efficiently by comparing the non-NULL
- * pointers in the old and new objects.  The only arrays that are "dirty" are
- * the ones that are non-NULL in either object.
+ * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().
+ * \param genRequired  specifies behavour when id was not generated with
+ *                     glGenVertexArrays().
 */
-void GLAPIENTRY
-_mesa_BindVertexArrayAPPLE( GLuint id )
+static void
+bind_vertex_array(GLcontext *ctx, GLuint id, GLboolean genRequired)
 {
-   GET_CURRENT_CONTEXT(ctx);
   struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
   struct gl_array_object *newObj = NULL;
   ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -386,8 +384,12 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
      /* non-default array object */
      newObj = lookup_arrayobj(ctx, id);
      if (!newObj) {
-         /* If this is a new array object id, allocate an array object now.
-	  */
+         if (genRequired) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
+            return;
+         }
+
+         /* For APPLE version, generate a new array object now */
 	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
         if (!newObj) {
            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
@ -403,7 +405,37 @@ _mesa_BindVertexArrayAPPLE( GLuint id )

   /* Pass BindVertexArray call to device driver */
   if (ctx->Driver.BindArrayObject && newObj)
-      (*ctx->Driver.BindArrayObject)( ctx, newObj );
+      ctx->Driver.BindArrayObject(ctx, newObj);
+}
+
+
+/**
+ * ARB version of glBindVertexArray()
+ * This function behaves differently from glBindVertexArrayAPPLE() in
+ * that this function requires all ids to have been previously generated
+ * by glGenVertexArrays[APPLE]().
+ */
+void GLAPIENTRY
+_mesa_BindVertexArray( GLuint id )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_vertex_array(ctx, id, GL_TRUE);
+}
+
+
+/**
+ * Bind a new array.
+ *
+ * \todo
+ * The binding could be done more efficiently by comparing the non-NULL
+ * pointers in the old and new objects.  The only arrays that are "dirty" are
+ * the ones that are non-NULL in either object.
+ */
+void GLAPIENTRY
+_mesa_BindVertexArrayAPPLE( GLuint id )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_vertex_array(ctx, id, GL_FALSE);
 }


@ -425,8 +457,6 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
      return;
   }

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
   for (i = 0; i < n; i++) {
      struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);

@ -450,21 +480,19 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
         _mesa_reference_array_object(ctx, &obj, NULL);
      }
   }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 }


 /**
 * Generate a set of unique array object IDs and store them in \c arrays.
- * 
+ * Helper for _mesa_GenVertexArrays[APPLE]() functions below.
 * \param n       Number of IDs to generate.
 * \param arrays  Array of \c n locations to store the IDs.
+ * \param vboOnly Will arrays have to reside in VBOs?
 */
-void GLAPIENTRY
-_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
+static void 
+gen_vertex_arrays(GLcontext *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
 {
-   GET_CURRENT_CONTEXT(ctx);
   GLuint first;
   GLint i;
   ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -478,12 +506,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
      return;
   }

-   /*
-    * This must be atomic (generation and allocation of array object IDs)
-    */
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ArrayObjects, n);
+   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);

   /* Allocate new, empty array objects and return identifiers */
   for (i = 0; i < n; i++) {
@ -492,15 +515,37 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)

      obj = (*ctx->Driver.NewArrayObject)( ctx, name );
      if (!obj) {
-         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
         return;
      }
+      obj->VBOonly = vboOnly;
      save_array_object(ctx, obj);
      arrays[i] = first + i;
   }
+}

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+/**
+ * ARB version of glGenVertexArrays()
+ * All arrays will be required to live in VBOs.
+ */
+void GLAPIENTRY
+_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);
+}
+
+
+/**
+ * APPLE version of glGenVertexArraysAPPLE()
+ * Arrays may live in VBOs or ordinary memory.
+ */
+void GLAPIENTRY
+_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);
 }


@ -521,9 +566,7 @@ _mesa_IsVertexArrayAPPLE( GLuint id )
   if (id == 0)
      return GL_FALSE;

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
   obj = lookup_arrayobj(ctx, id);
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

   return (obj != NULL) ? GL_TRUE : GL_FALSE;
 }
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@ -67,10 +67,15 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
 * API functions
 */

+
+void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
+
 void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );

 void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);

+void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
+
 void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);

 GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@ -1011,6 +1011,7 @@ _mesa_free_context_data( GLcontext *ctx )
 #if FEATURE_ARB_occlusion_query
   _mesa_free_query_data(ctx);
 #endif
+   _mesa_free_varray_data(ctx);

   _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);

--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@ -1799,6 +1799,7 @@ LONGSTRING static const char enum_string_table[] =
   "GL_VENDOR\0"
   "GL_VERSION\0"
   "GL_VERTEX_ARRAY\0"
+   "GL_VERTEX_ARRAY_BINDING\0"
   "GL_VERTEX_ARRAY_BINDING_APPLE\0"
   "GL_VERTEX_ARRAY_BUFFER_BINDING\0"
   "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB\0"
@ -1870,7 +1871,7 @@ LONGSTRING static const char enum_string_table[] =
   "GL_ZOOM_Y\0"
   ;

-static const enum_elt all_enums[1832] =
+static const enum_elt all_enums[1833] =
 {
   {     0, 0x00000600 }, /* GL_2D */
   {     6, 0x00001407 }, /* GL_2_BYTES */
@ -3635,75 +3636,76 @@ static const enum_elt all_enums[1832] =
   { 37885, 0x00001F00 }, /* GL_VENDOR */
   { 37895, 0x00001F02 }, /* GL_VERSION */
   { 37906, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 37922, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 37952, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 37983, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38018, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38042, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38063, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38086, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38107, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38134, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38162, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38190, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38218, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38246, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38274, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38302, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38329, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38356, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38383, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38410, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38437, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38464, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38491, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38518, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38545, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38583, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38625, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38656, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38691, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 38725, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 38763, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 38794, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 38829, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 38857, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 38889, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 38919, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 38953, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 38981, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39013, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39033, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39055, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39084, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39105, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39134, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39167, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39199, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39226, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39257, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39287, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39304, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39325, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39352, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39364, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39380, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39400, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39431, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39466, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39494, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39519, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39546, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39571, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39595, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39614, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39628, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39646, 0x00001506 }, /* GL_XOR */
-   { 39653, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39672, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39686, 0x00000000 }, /* GL_ZERO */
-   { 39694, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39704, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 37922, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 37946, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 37976, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38007, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38042, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38066, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38087, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38110, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38131, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38158, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38186, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38214, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38242, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38270, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38298, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38326, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38353, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38380, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38407, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38434, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38461, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 38488, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 38515, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 38542, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 38569, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 38607, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 38649, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 38680, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 38715, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 38749, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 38787, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 38818, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 38853, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 38881, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 38913, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 38943, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 38977, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39005, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39037, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39057, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39079, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39108, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39129, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39158, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39191, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39223, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39250, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39281, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39311, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39328, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39349, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39376, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39388, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39404, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39424, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39455, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 39490, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 39518, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 39543, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 39570, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 39595, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 39619, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 39638, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 39652, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 39670, 0x00001506 }, /* GL_XOR */
+   { 39677, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 39696, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 39710, 0x00000000 }, /* GL_ZERO */
+   { 39718, 0x00000D16 }, /* GL_ZOOM_X */
+   { 39728, 0x00000D17 }, /* GL_ZOOM_Y */
 };

 static const unsigned reduced_enums[1325] =
@ -3848,7 +3850,7 @@ static const unsigned reduced_enums[1325] =
      1504, /* GL_STENCIL_WRITEMASK */
       839, /* GL_MATRIX_MODE */
      1007, /* GL_NORMALIZE */
-      1813, /* GL_VIEWPORT */
+      1814, /* GL_VIEWPORT */
       981, /* GL_MODELVIEW_STACK_DEPTH */
      1244, /* GL_PROJECTION_STACK_DEPTH */
      1699, /* GL_TEXTURE_STACK_DEPTH */
@ -3928,8 +3930,8 @@ static const unsigned reduced_enums[1325] =
       628, /* GL_INDEX_OFFSET */
      1291, /* GL_RED_SCALE */
      1289, /* GL_RED_BIAS */
-      1830, /* GL_ZOOM_X */
-      1831, /* GL_ZOOM_Y */
+      1831, /* GL_ZOOM_X */
+      1832, /* GL_ZOOM_Y */
       590, /* GL_GREEN_SCALE */
       588, /* GL_GREEN_BIAS */
        92, /* GL_BLUE_SCALE */
@ -4030,7 +4032,7 @@ static const unsigned reduced_enums[1325] =
       295, /* GL_COPY */
        50, /* GL_AND_INVERTED */
      1005, /* GL_NOOP */
-      1826, /* GL_XOR */
+      1827, /* GL_XOR */
      1067, /* GL_OR */
      1006, /* GL_NOR */
       462, /* GL_EQUIV */
@ -4255,9 +4257,9 @@ static const unsigned reduced_enums[1325] =
       618, /* GL_INDEX_ARRAY */
      1634, /* GL_TEXTURE_COORD_ARRAY */
       451, /* GL_EDGE_FLAG_ARRAY */
-      1767, /* GL_VERTEX_ARRAY_SIZE */
-      1769, /* GL_VERTEX_ARRAY_TYPE */
-      1768, /* GL_VERTEX_ARRAY_STRIDE */
+      1768, /* GL_VERTEX_ARRAY_SIZE */
+      1770, /* GL_VERTEX_ARRAY_TYPE */
+      1769, /* GL_VERTEX_ARRAY_STRIDE */
      1013, /* GL_NORMAL_ARRAY_TYPE */
      1012, /* GL_NORMAL_ARRAY_STRIDE */
       149, /* GL_COLOR_ARRAY_SIZE */
@ -4269,7 +4271,7 @@ static const unsigned reduced_enums[1325] =
      1640, /* GL_TEXTURE_COORD_ARRAY_TYPE */
      1639, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
       455, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1766, /* GL_VERTEX_ARRAY_POINTER */
+      1767, /* GL_VERTEX_ARRAY_POINTER */
      1011, /* GL_NORMAL_ARRAY_POINTER */
       148, /* GL_COLOR_ARRAY_POINTER */
       621, /* GL_INDEX_ARRAY_POINTER */
@ -4369,7 +4371,7 @@ static const unsigned reduced_enums[1325] =
       302, /* GL_CULL_VERTEX_EXT */
       304, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
       303, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1823, /* GL_WRAP_BORDER_SUN */
+      1824, /* GL_WRAP_BORDER_SUN */
      1618, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
       676, /* GL_LIGHT_MODEL_COLOR_CONTROL */
      1415, /* GL_SINGLE_COLOR */
@ -4535,19 +4537,19 @@ static const unsigned reduced_enums[1325] =
      1053, /* GL_OPERAND1_ALPHA */
      1059, /* GL_OPERAND2_ALPHA */
      1065, /* GL_OPERAND3_ALPHA_NV */
-      1763, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-      1827, /* GL_YCBCR_422_APPLE */
+      1763, /* GL_VERTEX_ARRAY_BINDING */
+      1828, /* GL_YCBCR_422_APPLE */
      1752, /* GL_UNSIGNED_SHORT_8_8_APPLE */
      1754, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
      1417, /* GL_SLICE_ACCUM_SUN */
      1267, /* GL_QUAD_MESH_SUN */
      1723, /* GL_TRIANGLE_MESH_SUN */
-      1801, /* GL_VERTEX_PROGRAM_ARB */
-      1812, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1796, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1798, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1802, /* GL_VERTEX_PROGRAM_ARB */
+      1813, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1789, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
       330, /* GL_CURRENT_VERTEX_ATTRIB */
      1221, /* GL_PROGRAM_LENGTH_ARB */
      1235, /* GL_PROGRAM_STRING_ARB */
@ -4568,33 +4570,33 @@ static const unsigned reduced_enums[1325] =
       831, /* GL_MATRIX7_NV */
       314, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
       311, /* GL_CURRENT_MATRIX_ARB */
-      1804, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1807, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1805, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1808, /* GL_VERTEX_PROGRAM_TWO_SIDE */
      1233, /* GL_PROGRAM_PARAMETER_NV */
-      1792, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1793, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
      1237, /* GL_PROGRAM_TARGET_NV */
      1234, /* GL_PROGRAM_RESIDENT_NV */
      1708, /* GL_TRACK_MATRIX_NV */
      1709, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1802, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1803, /* GL_VERTEX_PROGRAM_BINDING_NV */
      1215, /* GL_PROGRAM_ERROR_POSITION_ARB */
       351, /* GL_DEPTH_CLAMP_NV */
-      1770, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1777, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1778, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1779, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1771, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1772, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1773, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1774, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1775, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1776, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1771, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1778, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1779, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1780, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1781, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1782, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1783, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1784, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1785, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1786, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1772, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1773, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1774, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1775, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1776, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1777, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
       743, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
       750, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
       751, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@ -4633,14 +4635,14 @@ static const unsigned reduced_enums[1325] =
       266, /* GL_COMPRESSED_TEXTURE_FORMATS */
       928, /* GL_MAX_VERTEX_UNITS_ARB */
        22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1822, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1800, /* GL_VERTEX_BLEND_ARB */
+      1823, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1801, /* GL_VERTEX_BLEND_ARB */
       332, /* GL_CURRENT_WEIGHT_ARB */
-      1821, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1820, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1819, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1818, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1815, /* GL_WEIGHT_ARRAY_ARB */
+      1822, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1821, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1820, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1819, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1816, /* GL_WEIGHT_ARRAY_ARB */
       379, /* GL_DOT3_RGB */
       380, /* GL_DOT3_RGBA */
       260, /* GL_COMPRESSED_RGB_FXT1_3DFX */
@ -4685,7 +4687,7 @@ static const unsigned reduced_enums[1325] =
       983, /* GL_MODULATE_ADD_ATI */
       984, /* GL_MODULATE_SIGNED_ADD_ATI */
       985, /* GL_MODULATE_SUBTRACT_ATI */
-      1828, /* GL_YCBCR_MESA */
+      1829, /* GL_YCBCR_MESA */
      1074, /* GL_PACK_INVERT_MESA */
       335, /* GL_DEBUG_OBJECT_MESA */
       336, /* GL_DEBUG_PRINT_MESA */
@ -4758,7 +4760,7 @@ static const unsigned reduced_enums[1325] =
      1271, /* GL_QUERY_RESULT */
      1273, /* GL_QUERY_RESULT_AVAILABLE */
       922, /* GL_MAX_VERTEX_ATTRIBS */
-      1790, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1791, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
       370, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
       369, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
       908, /* GL_MAX_TEXTURE_COORDS */
@ -4773,7 +4775,7 @@ static const unsigned reduced_enums[1325] =
       456, /* GL_ELEMENT_ARRAY_BUFFER */
        53, /* GL_ARRAY_BUFFER_BINDING */
       457, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1764, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1765, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
      1009, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
       146, /* GL_COLOR_ARRAY_BUFFER_BINDING */
       619, /* GL_INDEX_ARRAY_BUFFER_BINDING */
@ -4781,8 +4783,8 @@ static const unsigned reduced_enums[1325] =
       452, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
      1392, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
       505, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1816, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1817, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1787, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
      1220, /* GL_PROGRAM_INSTRUCTIONS_ARB */
       883, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
      1226, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@ -4808,7 +4810,7 @@ static const unsigned reduced_enums[1325] =
      1241, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
      1713, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
      1282, /* GL_READ_ONLY */
-      1824, /* GL_WRITE_ONLY */
+      1825, /* GL_WRITE_ONLY */
      1284, /* GL_READ_WRITE */
       101, /* GL_BUFFER_ACCESS */
       103, /* GL_BUFFER_MAPPED */
@ -4872,7 +4874,7 @@ static const unsigned reduced_enums[1325] =
       943, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
      1373, /* GL_SAMPLES_PASSED */
       528, /* GL_FRAGMENT_SHADER */
-      1810, /* GL_VERTEX_SHADER */
+      1811, /* GL_VERTEX_SHADER */
      1231, /* GL_PROGRAM_OBJECT_ARB */
      1405, /* GL_SHADER_OBJECT_ARB */
       867, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@ -78,6 +78,7 @@ static const struct {
   { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
   { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
   { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
+   { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },
   { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
   { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
   { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },
@ -227,6 +228,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
   /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/
   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
 #if FEATURE_ARB_vertex_program
   ctx->Extensions.ARB_vertex_program = GL_TRUE;
 #endif
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@ -1563,6 +1563,7 @@ struct gl_array_object

   GLint RefCount;
   _glthread_Mutex Mutex;
+   GLboolean VBOonly;  /**< require all arrays to live in VBOs? */

   /** Conventional vertex arrays */
   /*@{*/
@ -1608,6 +1609,9 @@ struct gl_array_attrib
   /** The default vertex array object */
   struct gl_array_object *DefaultArrayObj;

+   /** Array objects (GL_ARB/APPLE_vertex_array_object) */
+   struct _mesa_HashTable *Objects;
+
   GLint ActiveTexture;		/**< Client Active Texture */
   GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */
   GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */
@ -2120,9 +2124,6 @@ struct gl_shared_state
   struct _mesa_HashTable *FrameBuffers;
 #endif

-   /** Objects associated with the GL_APPLE_vertex_array_object extension. */
-   struct _mesa_HashTable *ArrayObjects;
-
   void *DriverData;  /**< Device driver shared state */
 };

@ -2468,6 +2469,7 @@ struct gl_extensions
   GLboolean ARB_texture_mirrored_repeat;
   GLboolean ARB_texture_non_power_of_two;
   GLboolean ARB_transpose_matrix;
+   GLboolean ARB_vertex_array_object;
   GLboolean ARB_vertex_buffer_object;
   GLboolean ARB_vertex_program;
   GLboolean ARB_vertex_shader;
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@ -100,8 +100,6 @@ _mesa_alloc_shared_state(GLcontext *ctx)
   shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);
   shared->NullBufferObj->RefCount = 1000 * 1000 * 1000;

-   shared->ArrayObjects = _mesa_NewHashTable();
-
   /* Create default texture objects */
   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
@ -206,18 +204,6 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
 }


-/**
- * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_arrayobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_array_object(ctx, arrayObj);
-}
-
-
 /**
 * Callback for freeing shader program data. Call it before delete_shader_cb
 * to avoid memory access error.
@ -320,9 +306,6 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
   _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
   _mesa_DeleteHashTable(shared->Programs);

-   _mesa_HashDeleteAll(shared->ArrayObjects, delete_arrayobj_cb, ctx);
-   _mesa_DeleteHashTable(shared->ArrayObjects);
-
 #if FEATURE_ARB_vertex_program
   _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
 #endif
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@ -30,6 +30,7 @@
 #include "context.h"
 #include "enable.h"
 #include "enums.h"
+#include "hash.h"
 #include "mtypes.h"
 #include "varray.h"
 #include "arrayobj.h"
@ -38,6 +39,8 @@

 /**
 * Set the fields of a vertex array.
+ * Also do an error check for GL_ARB_vertex_array_object: check that
+ * all arrays reside in VBOs when using a vertex array object.
 *
 * \param array  the array to update
 * \param dirtyBit  which bit to set in ctx->Array.NewState for this array
@ -48,14 +51,26 @@
 * \param stride  stride between elements, in elements
 * \param normalized  are integer types converted to floats in [-1, 1]?
 * \param ptr  the address (or offset inside VBO) of the array data
+ * \return GL_TRUE if no error, GL_FALSE if error
 */
-static void
+static GLboolean
 update_array(GLcontext *ctx, struct gl_client_array *array,
             GLbitfield dirtyBit, GLsizei elementSize,
             GLint size, GLenum type, GLenum format,
             GLsizei stride, GLboolean normalized, const GLvoid *ptr)
 {
   ASSERT(format == GL_RGBA || format == GL_BGRA);
+
+   if (ctx->Array.ArrayObj->VBOonly &&
+       ctx->Array.ArrayBufferObj->Name == 0) {
+      /* GL_ARB_vertex_array_object requires that all arrays reside in VBOs.
+       * Generate GL_INVALID_OPERATION if that's not true.
+       */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glVertex/Normal/EtcPointer(non-VBO array)");
+      return GL_FALSE;
+   }
+
   array->Size = size;
   array->Type = type;
   array->Format = format;
@ -70,6 +85,8 @@ update_array(GLcontext *ctx, struct gl_client_array *array,

   ctx->NewState |= _NEW_ARRAY;
   ctx->Array.NewState |= dirtyBit;
+
+   return GL_TRUE;
 }


@ -122,8 +139,9 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
+                     elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;

   if (ctx->Driver.VertexPointer)
      ctx->Driver.VertexPointer( ctx, size, type, stride, ptr );
@ -172,8 +190,9 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
-                elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
+                     elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr))
+      return;

   if (ctx->Driver.NormalPointer)
      ctx->Driver.NormalPointer( ctx, type, stride, ptr );
@ -250,8 +269,9 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
+                     elementSize, size, type, format, stride, GL_TRUE, ptr))
+      return;

   if (ctx->Driver.ColorPointer)
      ctx->Driver.ColorPointer( ctx, size, type, stride, ptr );
@ -282,8 +302,9 @@ _mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
+                     elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;

   if (ctx->Driver.FogCoordPointer)
      ctx->Driver.FogCoordPointer( ctx, type, stride, ptr );
@ -323,8 +344,9 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
+                     elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;

   if (ctx->Driver.IndexPointer)
      ctx->Driver.IndexPointer( ctx, type, stride, ptr );
@ -397,8 +419,10 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor, _NEW_ARRAY_COLOR1,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor,
+                     _NEW_ARRAY_COLOR1, elementSize, size, type,
+                     format, stride, GL_TRUE, ptr))
+      return;

   if (ctx->Driver.SecondaryColorPointer)
      ctx->Driver.SecondaryColorPointer( ctx, size, type, stride, ptr );
@ -456,9 +480,10 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
-                _NEW_ARRAY_TEXCOORD(unit),
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
+                     _NEW_ARRAY_TEXCOORD(unit),
+                     elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr))
+      return;

   if (ctx->Driver.TexCoordPointer)
      ctx->Driver.TexCoordPointer( ctx, size, type, stride, ptr );
@ -476,9 +501,10 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
      return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
-                sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
-                stride, GL_FALSE, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
+                     sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
+                     stride, GL_FALSE, ptr))
+      return;

   if (ctx->Driver.EdgeFlagPointer)
      ctx->Driver.EdgeFlagPointer( ctx, stride, ptr );
@ -588,9 +614,10 @@ _mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
+                     _NEW_ARRAY_ATTRIB(index),
+                     elementSize, size, type, format, stride, normalized, ptr))
+      return;

   if (ctx->Driver.VertexAttribPointer)
      ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
@ -687,9 +714,10 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
         return;
   }

-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
+   if (!update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
+                     _NEW_ARRAY_ATTRIB(index),
+                     elementSize, size, type, format, stride, normalized, ptr))
+      return;

   if (ctx->Driver.VertexAttribPointer)
      ctx->Driver.VertexAttribPointer(ctx, index, size, type, stride, ptr);
@ -1120,4 +1148,29 @@ _mesa_init_varray(GLcontext *ctx)
   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
                                ctx->Array.DefaultArrayObj);
   ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
+
+   ctx->Array.Objects = _mesa_NewHashTable();
+}
+
+
+/**
+ * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_arrayobj_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
+   GLcontext *ctx = (GLcontext *) userData;
+   _mesa_delete_array_object(ctx, arrayObj);
+}
+
+
+/**
+ * Free vertex array state for given context.
+ */
+void 
+_mesa_free_varray_data(GLcontext *ctx)
+{
+   _mesa_HashDeleteAll(ctx->Array.Objects, delete_arrayobj_cb, ctx);
+   _mesa_DeleteHashTable(ctx->Array.Objects);
 }
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@ -166,10 +166,14 @@ _mesa_print_arrays(GLcontext *ctx);
 extern void
 _mesa_init_varray( GLcontext * ctx );

+extern void 
+_mesa_free_varray_data(GLcontext *ctx);
+
 #else

 /** No-op */
 #define _mesa_init_varray( c )  ((void)0)
+#define _mesa_free_varray_data( c )  ((void)0)

 #endif

--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@ -761,24 +761,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glRenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample)
 	GL_STUB(glFlushMappedBufferRange, _gloffset_FlushMappedBufferRange)
 	GL_STUB(glMapBufferRange, _gloffset_MapBufferRange)
+	GL_STUB(glBindVertexArray, _gloffset_BindVertexArray)
+	GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_566)
-	GL_STUB(gl_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_567)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS)
+	GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS)
+	GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS)
+	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS)
 	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS)
+	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_571)
-	GL_STUB(gl_dispatch_stub_572, _gloffset_SampleMaskSGIS)
+	GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS)
 	HIDDEN(gl_dispatch_stub_572)
-	GL_STUB(gl_dispatch_stub_573, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS)
 	HIDDEN(gl_dispatch_stub_573)
+	GL_STUB(gl_dispatch_stub_574, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_574)
+	GL_STUB(gl_dispatch_stub_575, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_575)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@ -789,10 +791,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_584, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_584)
-	GL_STUB(gl_dispatch_stub_585, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_585)
+	GL_STUB(gl_dispatch_stub_586, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_586)
+	GL_STUB(gl_dispatch_stub_587, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_587)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@ -817,8 +819,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_610, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_610)
+	GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_612)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@ -860,24 +862,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_652)
-	GL_STUB(gl_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_653)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_DeleteFencesNV)
+	GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_FinishFenceNV)
+	GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_GenFencesNV)
+	GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV)
 	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_GetFenceivNV)
+	GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV)
 	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_IsFenceNV)
+	GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV)
 	HIDDEN(gl_dispatch_stub_658)
-	GL_STUB(gl_dispatch_stub_659, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV)
 	HIDDEN(gl_dispatch_stub_659)
-	GL_STUB(gl_dispatch_stub_660, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV)
 	HIDDEN(gl_dispatch_stub_660)
+	GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_661)
+	GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_662)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@ -958,26 +960,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_741)
-	GL_STUB(gl_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_742)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT)
 	HIDDEN(gl_dispatch_stub_743)
-	GL_STUB(gl_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE)
+	GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE)
 	HIDDEN(gl_dispatch_stub_744)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE)
+	GL_STUB(gl_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE)
 	HIDDEN(gl_dispatch_stub_745)
+	GL_STUB(gl_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_746)
+	GL_STUB(gl_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_747)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_752, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_752)
-	GL_STUB(gl_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_753)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_754)
+	GL_STUB(gl_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_755)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@ -995,20 +997,20 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_771, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_771)
+	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
+	HIDDEN(gl_dispatch_stub_773)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_775)
-	GL_STUB(gl_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_776, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_777)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_778)
+	GL_STUB(gl_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_779)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_780)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@ -153,8 +153,9 @@ void st_init_extensions(struct st_context *st)
   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
-   ctx->Extensions.ARB_vertex_program = GL_TRUE;
+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+   ctx->Extensions.ARB_vertex_program = GL_TRUE;

   ctx->Extensions.EXT_blend_color = GL_TRUE;
   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@ -715,24 +715,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(RenderbufferStorageMultisample, _gloffset_RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
 	GL_STUB(FlushMappedBufferRange, _gloffset_FlushMappedBufferRange, FlushMappedBufferRange@12)
 	GL_STUB(MapBufferRange, _gloffset_MapBufferRange, MapBufferRange@16)
+	GL_STUB(BindVertexArray, _gloffset_BindVertexArray, BindVertexArray@4)
+	GL_STUB(GenVertexArrays, _gloffset_GenVertexArrays, GenVertexArrays@8)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_566, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_566@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_566, _dispatch_stub_566@8))
-	GL_STUB(_dispatch_stub_567, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_567@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_567, _dispatch_stub_567@8))
-	GL_STUB(_dispatch_stub_568, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_568@8)
+	GL_STUB(_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_568@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_569@8)
+	GL_STUB(_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_569@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_570@8)
+	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_570@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_571@8)
+	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_571@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
-	GL_STUB(_dispatch_stub_572, _gloffset_SampleMaskSGIS, _dispatch_stub_572@8)
+	GL_STUB(_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_572@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
-	GL_STUB(_dispatch_stub_573, _gloffset_SamplePatternSGIS, _dispatch_stub_573@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@4))
+	GL_STUB(_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_573@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@8))
+	GL_STUB(_dispatch_stub_574, _gloffset_SampleMaskSGIS, _dispatch_stub_574@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_574, _dispatch_stub_574@8))
+	GL_STUB(_dispatch_stub_575, _gloffset_SamplePatternSGIS, _dispatch_stub_575@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@ -743,10 +745,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_584, _gloffset_CullParameterdvEXT, _dispatch_stub_584@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_584, _dispatch_stub_584@8))
-	GL_STUB(_dispatch_stub_585, _gloffset_CullParameterfvEXT, _dispatch_stub_585@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_585, _dispatch_stub_585@8))
+	GL_STUB(_dispatch_stub_586, _gloffset_CullParameterdvEXT, _dispatch_stub_586@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_586, _dispatch_stub_586@8))
+	GL_STUB(_dispatch_stub_587, _gloffset_CullParameterfvEXT, _dispatch_stub_587@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@ -771,8 +773,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_610, _gloffset_PixelTexGenSGIX, _dispatch_stub_610@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_610, _dispatch_stub_610@4))
+	GL_STUB(_dispatch_stub_612, _gloffset_PixelTexGenSGIX, _dispatch_stub_612@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_612, _dispatch_stub_612@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@ -814,24 +816,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_652, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_652@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_652, _dispatch_stub_652@20))
-	GL_STUB(_dispatch_stub_653, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_653@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_653, _dispatch_stub_653@24))
-	GL_STUB(_dispatch_stub_654, _gloffset_DeleteFencesNV, _dispatch_stub_654@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@8))
-	GL_STUB(_dispatch_stub_655, _gloffset_FinishFenceNV, _dispatch_stub_655@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@4))
-	GL_STUB(_dispatch_stub_656, _gloffset_GenFencesNV, _dispatch_stub_656@8)
+	GL_STUB(_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_654@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@20))
+	GL_STUB(_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_655@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@24))
+	GL_STUB(_dispatch_stub_656, _gloffset_DeleteFencesNV, _dispatch_stub_656@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_GetFenceivNV, _dispatch_stub_657@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@12))
-	GL_STUB(_dispatch_stub_658, _gloffset_IsFenceNV, _dispatch_stub_658@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@4))
-	GL_STUB(_dispatch_stub_659, _gloffset_SetFenceNV, _dispatch_stub_659@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@8))
-	GL_STUB(_dispatch_stub_660, _gloffset_TestFenceNV, _dispatch_stub_660@4)
+	GL_STUB(_dispatch_stub_657, _gloffset_FinishFenceNV, _dispatch_stub_657@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
+	GL_STUB(_dispatch_stub_658, _gloffset_GenFencesNV, _dispatch_stub_658@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@8))
+	GL_STUB(_dispatch_stub_659, _gloffset_GetFenceivNV, _dispatch_stub_659@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@12))
+	GL_STUB(_dispatch_stub_660, _gloffset_IsFenceNV, _dispatch_stub_660@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
+	GL_STUB(_dispatch_stub_661, _gloffset_SetFenceNV, _dispatch_stub_661@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@8))
+	GL_STUB(_dispatch_stub_662, _gloffset_TestFenceNV, _dispatch_stub_662@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@ -912,26 +914,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_741, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_741@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@4))
-	GL_STUB(_dispatch_stub_742, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_742@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@4))
-	GL_STUB(_dispatch_stub_743, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_743@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@8))
-	GL_STUB(_dispatch_stub_744, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_744@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@8))
-	GL_STUB(_dispatch_stub_745, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_745@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@4))
+	GL_STUB(_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_743@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
+	GL_STUB(_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_744@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
+	GL_STUB(_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_745@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
+	GL_STUB(_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_746@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
+	GL_STUB(_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_747@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_747, _dispatch_stub_747@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_752, _gloffset_DepthBoundsEXT, _dispatch_stub_752@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@16))
-	GL_STUB(_dispatch_stub_753, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_753@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
+	GL_STUB(_dispatch_stub_754, _gloffset_DepthBoundsEXT, _dispatch_stub_754@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@16))
+	GL_STUB(_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_755@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_755, _dispatch_stub_755@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@ -949,20 +951,20 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_771, _gloffset_BlitFramebufferEXT, _dispatch_stub_771@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@40))
+	GL_STUB(_dispatch_stub_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_774, _gloffset_StencilFuncSeparateATI, _dispatch_stub_774@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@16))
-	GL_STUB(_dispatch_stub_775, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_775@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@16))
-	GL_STUB(_dispatch_stub_776, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_776@16)
+	GL_STUB(_dispatch_stub_776, _gloffset_StencilFuncSeparateATI, _dispatch_stub_776@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@16))
-	GL_STUB(_dispatch_stub_777, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_777@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@12))
-	GL_STUB(_dispatch_stub_778, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_778@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
+	GL_STUB(_dispatch_stub_777, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_777@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@16))
+	GL_STUB(_dispatch_stub_778, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_778@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@16))
+	GL_STUB(_dispatch_stub_779, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_779@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_780@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)