Add support for GL_APPLE_vertex_array_object. Several test programs

and demos are also added.

Adding basic support to drivers should be as easy as just enabling the
extension, though thorough test would also be required.

1 files changed, 115 insertions, 112 deletions

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index ecda0bfb5ed..2b3a275dba8 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1593,6 +1593,7 @@ static const char enum_string_table[] =
    "GL_VENDOR\0"
    "GL_VERSION\0"
    "GL_VERTEX_ARRAY\0"
+   "GL_VERTEX_ARRAY_BINDING_APPLE\0"
    "GL_VERTEX_ARRAY_BUFFER_BINDING\0"
    "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB\0"
    "GL_VERTEX_ARRAY_POINTER\0"
@@ -1654,7 +1655,7 @@ static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1617] =
+static const enum_elt all_enums[1618] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3214,70 +3215,70 @@ static const enum_elt all_enums[1617] =
    { 33142, 0x00001F00 }, /* GL_VENDOR */
    { 33152, 0x00001F02 }, /* GL_VERSION */
    { 33163, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 33179, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 33210, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 33245, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 33269, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 33290, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 33313, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 33334, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 33361, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 33389, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 33417, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 33445, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 33473, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 33501, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 33529, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 33556, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 33583, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 33610, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 33637, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 33664, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 33691, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 33718, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 33745, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 33772, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 33810, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 33852, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 33887, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 33925, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 33960, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 33992, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 34026, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 34058, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 34078, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 34100, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 34129, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 34150, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 34183, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 34215, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 34246, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 34276, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 34297, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 34324, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 34336, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 34352, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 34372, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 34403, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 34438, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 34466, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 34491, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 34518, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 34543, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 34567, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 34586, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 34600, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 34618, 0x00001506 }, /* GL_XOR */
-   { 34625, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 34644, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 34658, 0x00000000 }, /* GL_ZERO */
-   { 34666, 0x00000D16 }, /* GL_ZOOM_X */
-   { 34676, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 33179, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 33209, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 33240, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 33275, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 33299, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 33320, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 33343, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 33364, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 33391, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 33419, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 33447, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 33475, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 33503, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 33531, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 33559, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 33586, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 33613, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 33640, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 33667, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 33694, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 33721, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 33748, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 33775, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 33802, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 33840, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 33882, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 33917, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 33955, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 33990, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 34022, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 34056, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 34088, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 34108, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 34130, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 34159, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 34180, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 34213, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 34245, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 34276, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 34306, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 34327, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 34354, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 34366, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 34382, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 34402, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 34433, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 34468, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 34496, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 34521, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 34548, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 34573, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 34597, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 34616, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 34630, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 34648, 0x00001506 }, /* GL_XOR */
+   { 34655, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 34674, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 34688, 0x00000000 }, /* GL_ZERO */
+   { 34696, 0x00000D16 }, /* GL_ZOOM_X */
+   { 34706, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1236] =
+static const unsigned reduced_enums[1237] =
 {
-        26, /* GL_ALL_CLIENT_ATTRIB_BITS */
        389, /* GL_FALSE */
        566, /* GL_LINES */
        568, /* GL_LINE_LOOP */
@@ -3418,7 +3419,7 @@ static const unsigned reduced_enums[1236] =
       1309, /* GL_STENCIL_WRITEMASK */
        710, /* GL_MATRIX_MODE */
        867, /* GL_NORMALIZE */
-      1598, /* GL_VIEWPORT */
+      1599, /* GL_VIEWPORT */
        841, /* GL_MODELVIEW_STACK_DEPTH */
       1099, /* GL_PROJECTION_STACK_DEPTH */
       1500, /* GL_TEXTURE_STACK_DEPTH */
@@ -3498,8 +3499,8 @@ static const unsigned reduced_enums[1236] =
        513, /* GL_INDEX_OFFSET */
       1139, /* GL_RED_SCALE */
       1137, /* GL_RED_BIAS */
-      1615, /* GL_ZOOM_X */
-      1616, /* GL_ZOOM_Y */
+      1616, /* GL_ZOOM_X */
+      1617, /* GL_ZOOM_Y */
        476, /* GL_GREEN_SCALE */
        474, /* GL_GREEN_BIAS */
         86, /* GL_BLUE_SCALE */
@@ -3600,7 +3601,7 @@ static const unsigned reduced_enums[1236] =
        246, /* GL_COPY */
         46, /* GL_AND_INVERTED */
        865, /* GL_NOOP */
-      1611, /* GL_XOR */
+      1612, /* GL_XOR */
        927, /* GL_OR */
        866, /* GL_NOR */
        380, /* GL_EQUIV */
@@ -3825,9 +3826,9 @@ static const unsigned reduced_enums[1236] =
        503, /* GL_INDEX_ARRAY */
       1435, /* GL_TEXTURE_COORD_ARRAY */
        368, /* GL_EDGE_FLAG_ARRAY */
-      1561, /* GL_VERTEX_ARRAY_SIZE */
-      1563, /* GL_VERTEX_ARRAY_TYPE */
-      1562, /* GL_VERTEX_ARRAY_STRIDE */
+      1562, /* GL_VERTEX_ARRAY_SIZE */
+      1564, /* GL_VERTEX_ARRAY_TYPE */
+      1563, /* GL_VERTEX_ARRAY_STRIDE */
        873, /* GL_NORMAL_ARRAY_TYPE */
        872, /* GL_NORMAL_ARRAY_STRIDE */
        133, /* GL_COLOR_ARRAY_SIZE */
@@ -3839,7 +3840,7 @@ static const unsigned reduced_enums[1236] =
       1441, /* GL_TEXTURE_COORD_ARRAY_TYPE */
       1440, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        372, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1560, /* GL_VERTEX_ARRAY_POINTER */
+      1561, /* GL_VERTEX_ARRAY_POINTER */
        871, /* GL_NORMAL_ARRAY_POINTER */
        132, /* GL_COLOR_ARRAY_POINTER */
        506, /* GL_INDEX_ARRAY_POINTER */
@@ -3939,7 +3940,7 @@ static const unsigned reduced_enums[1236] =
        251, /* GL_CULL_VERTEX_EXT */
        253, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        252, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1608, /* GL_WRAP_BORDER_SUN */
+      1609, /* GL_WRAP_BORDER_SUN */
       1419, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        555, /* GL_LIGHT_MODEL_COLOR_CONTROL */
       1240, /* GL_SINGLE_COLOR */
@@ -4092,18 +4093,19 @@ static const unsigned reduced_enums[1236] =
        913, /* GL_OPERAND1_ALPHA */
        919, /* GL_OPERAND2_ALPHA */
        925, /* GL_OPERAND3_ALPHA_NV */
-      1612, /* GL_YCBCR_422_APPLE */
+      1558, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+      1613, /* GL_YCBCR_422_APPLE */
       1549, /* GL_UNSIGNED_SHORT_8_8_APPLE */
       1551, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
       1242, /* GL_SLICE_ACCUM_SUN */
       1118, /* GL_QUAD_MESH_SUN */
       1522, /* GL_TRIANGLE_MESH_SUN */
-      1589, /* GL_VERTEX_PROGRAM_ARB */
-      1597, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1582, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-      1585, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-      1586, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-      1587, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+      1590, /* GL_VERTEX_PROGRAM_ARB */
+      1598, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1583, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+      1586, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+      1587, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+      1588, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
        277, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
       1076, /* GL_PROGRAM_LENGTH_ARB */
       1090, /* GL_PROGRAM_STRING_ARB */
@@ -4124,33 +4126,33 @@ static const unsigned reduced_enums[1236] =
        702, /* GL_MATRIX7_NV */
        263, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        260, /* GL_CURRENT_MATRIX_ARB */
-      1592, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-      1594, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+      1593, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+      1595, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
       1088, /* GL_PROGRAM_PARAMETER_NV */
-      1584, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+      1585, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
       1092, /* GL_PROGRAM_TARGET_NV */
       1089, /* GL_PROGRAM_RESIDENT_NV */
       1507, /* GL_TRACK_MATRIX_NV */
       1508, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1590, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1591, /* GL_VERTEX_PROGRAM_BINDING_NV */
       1070, /* GL_PROGRAM_ERROR_POSITION_ARB */
        291, /* GL_DEPTH_CLAMP_NV */
-      1564, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1571, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1572, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1573, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1574, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1575, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1576, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1577, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1578, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1579, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1565, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1566, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1567, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1568, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1569, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1570, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1565, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1572, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1573, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1574, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1575, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1576, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1577, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1578, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1579, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1580, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1566, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1567, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1568, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1569, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1570, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1571, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        620, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        627, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        628, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -4189,14 +4191,14 @@ static const unsigned reduced_enums[1236] =
        218, /* GL_COMPRESSED_TEXTURE_FORMATS */
        788, /* GL_MAX_VERTEX_UNITS_ARB */
         18, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1607, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1588, /* GL_VERTEX_BLEND_ARB */
+      1608, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1589, /* GL_VERTEX_BLEND_ARB */
        278, /* GL_CURRENT_WEIGHT_ARB */
-      1606, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1605, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1604, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1603, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1600, /* GL_WEIGHT_ARRAY_ARB */
+      1607, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1606, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1605, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1604, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1601, /* GL_WEIGHT_ARRAY_ARB */
        317, /* GL_DOT3_RGB */
        318, /* GL_DOT3_RGBA */
        216, /* GL_COMPRESSED_RGB_FXT1_3DFX */
@@ -4241,7 +4243,7 @@ static const unsigned reduced_enums[1236] =
        843, /* GL_MODULATE_ADD_ATI */
        844, /* GL_MODULATE_SIGNED_ADD_ATI */
        845, /* GL_MODULATE_SUBTRACT_ATI */
-      1613, /* GL_YCBCR_MESA */
+      1614, /* GL_YCBCR_MESA */
        934, /* GL_PACK_INVERT_MESA */
         97, /* GL_BUFFER_SIZE */
         99, /* GL_BUFFER_USAGE */
@@ -4299,7 +4301,7 @@ static const unsigned reduced_enums[1236] =
       1122, /* GL_QUERY_RESULT */
       1124, /* GL_QUERY_RESULT_AVAILABLE */
        785, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-      1583, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+      1584, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
        308, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        307, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
        774, /* GL_MAX_TEXTURE_COORDS_ARB */
@@ -4314,7 +4316,7 @@ static const unsigned reduced_enums[1236] =
        373, /* GL_ELEMENT_ARRAY_BUFFER */
         50, /* GL_ARRAY_BUFFER_BINDING */
        375, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1558, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1559, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
        869, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        130, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        504, /* GL_INDEX_ARRAY_BUFFER_BINDING */
@@ -4322,8 +4324,8 @@ static const unsigned reduced_enums[1236] =
        369, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
       1221, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        410, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1601, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1580, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1602, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1581, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
       1075, /* GL_PROGRAM_INSTRUCTIONS_ARB */
        750, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
       1081, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
@@ -4349,7 +4351,7 @@ static const unsigned reduced_enums[1236] =
       1096, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
       1512, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
       1130, /* GL_READ_ONLY */
-      1609, /* GL_WRITE_ONLY */
+      1610, /* GL_WRITE_ONLY */
       1132, /* GL_READ_WRITE */
         91, /* GL_BUFFER_ACCESS */
         93, /* GL_BUFFER_MAPPED */
@@ -4410,7 +4412,7 @@ static const unsigned reduced_enums[1236] =
        803, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
       1202, /* GL_SAMPLES_PASSED */
        433, /* GL_FRAGMENT_SHADER_ARB */
-      1596, /* GL_VERTEX_SHADER_ARB */
+      1597, /* GL_VERTEX_SHADER_ARB */
       1086, /* GL_PROGRAM_OBJECT_ARB */
       1234, /* GL_SHADER_OBJECT_ARB */
        735, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
@@ -4513,6 +4515,7 @@ static const unsigned reduced_enums[1236] =
       1217, /* GL_SCISSOR_BIT */
         25, /* GL_ALL_ATTRIB_BITS */
        850, /* GL_MULTISAMPLE_BIT */
+        26, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
 #define Elements(x) sizeof(x)/sizeof(*x)