fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

xserver          commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11           commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto          commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig       commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa             commit b16b3c8703f198ca0f025b730d582600df79c19c

1 files changed, 221 insertions, 247 deletions

diff --git a/xorg-server/glx/indirect_table.c b/xorg-server/glx/indirect_table.c
index 8922e43fd..33e3d6a22 100644
--- a/xorg-server/glx/indirect_table.c
+++ b/xorg-server/glx/indirect_table.c
@@ -213,17 +213,16 @@ static const void *Single_function_table[112][2] = {
                           __glXDispSwap_GetMinmaxParameterfv},
     /* [ 103] =   159 */ {__glXDisp_GetMinmaxParameteriv,
                           __glXDispSwap_GetMinmaxParameteriv},
-    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImageARB,
-                          __glXDispSwap_GetCompressedTexImageARB},
-    /* [ 105] =   161 */ {__glXDisp_DeleteQueriesARB,
-                          __glXDispSwap_DeleteQueriesARB},
-    /* [ 106] =   162 */ {__glXDisp_GenQueriesARB, __glXDispSwap_GenQueriesARB},
-    /* [ 107] =   163 */ {__glXDisp_IsQueryARB, __glXDispSwap_IsQueryARB},
-    /* [ 108] =   164 */ {__glXDisp_GetQueryivARB, __glXDispSwap_GetQueryivARB},
-    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectivARB,
-                          __glXDispSwap_GetQueryObjectivARB},
-    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuivARB,
-                          __glXDispSwap_GetQueryObjectuivARB},
+    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImage,
+                          __glXDispSwap_GetCompressedTexImage},
+    /* [ 105] =   161 */ {__glXDisp_DeleteQueries, __glXDispSwap_DeleteQueries},
+    /* [ 106] =   162 */ {__glXDisp_GenQueries, __glXDispSwap_GenQueries},
+    /* [ 107] =   163 */ {__glXDisp_IsQuery, __glXDispSwap_IsQuery},
+    /* [ 108] =   164 */ {__glXDisp_GetQueryiv, __glXDispSwap_GetQueryiv},
+    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectiv,
+                          __glXDispSwap_GetQueryObjectiv},
+    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuiv,
+                          __glXDispSwap_GetQueryObjectuiv},
     /* [ 111] =   167 */ {NULL, NULL},
 };
 
@@ -576,52 +575,51 @@ static const void *Render_function_table[408][2] = {
     /* [ 195] =   195 */ {__glXDisp_ColorSubTable, __glXDispSwap_ColorSubTable},
     /* [ 196] =   196 */ {__glXDisp_CopyColorSubTable,
                           __glXDispSwap_CopyColorSubTable},
-    /* [ 197] =   197 */ {__glXDisp_ActiveTextureARB,
-                          __glXDispSwap_ActiveTextureARB},
-    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dvARB,
-                          __glXDispSwap_MultiTexCoord1dvARB},
+    /* [ 197] =   197 */ {__glXDisp_ActiveTexture, __glXDispSwap_ActiveTexture},
+    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dv,
+                          __glXDispSwap_MultiTexCoord1dv},
     /* [ 199] =   199 */ {__glXDisp_MultiTexCoord1fvARB,
                           __glXDispSwap_MultiTexCoord1fvARB},
-    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1ivARB,
-                          __glXDispSwap_MultiTexCoord1ivARB},
-    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1svARB,
-                          __glXDispSwap_MultiTexCoord1svARB},
-    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dvARB,
-                          __glXDispSwap_MultiTexCoord2dvARB},
+    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1iv,
+                          __glXDispSwap_MultiTexCoord1iv},
+    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1sv,
+                          __glXDispSwap_MultiTexCoord1sv},
+    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dv,
+                          __glXDispSwap_MultiTexCoord2dv},
     /* [ 203] =   203 */ {__glXDisp_MultiTexCoord2fvARB,
                           __glXDispSwap_MultiTexCoord2fvARB},
-    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2ivARB,
-                          __glXDispSwap_MultiTexCoord2ivARB},
-    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2svARB,
-                          __glXDispSwap_MultiTexCoord2svARB},
-    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dvARB,
-                          __glXDispSwap_MultiTexCoord3dvARB},
+    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2iv,
+                          __glXDispSwap_MultiTexCoord2iv},
+    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2sv,
+                          __glXDispSwap_MultiTexCoord2sv},
+    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dv,
+                          __glXDispSwap_MultiTexCoord3dv},
     /* [ 207] =   207 */ {__glXDisp_MultiTexCoord3fvARB,
                           __glXDispSwap_MultiTexCoord3fvARB},
-    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3ivARB,
-                          __glXDispSwap_MultiTexCoord3ivARB},
-    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3svARB,
-                          __glXDispSwap_MultiTexCoord3svARB},
-    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dvARB,
-                          __glXDispSwap_MultiTexCoord4dvARB},
+    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3iv,
+                          __glXDispSwap_MultiTexCoord3iv},
+    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3sv,
+                          __glXDispSwap_MultiTexCoord3sv},
+    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dv,
+                          __glXDispSwap_MultiTexCoord4dv},
     /* [ 211] =   211 */ {__glXDisp_MultiTexCoord4fvARB,
                           __glXDispSwap_MultiTexCoord4fvARB},
-    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4ivARB,
-                          __glXDispSwap_MultiTexCoord4ivARB},
-    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4svARB,
-                          __glXDispSwap_MultiTexCoord4svARB},
-    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1DARB,
-                          __glXDispSwap_CompressedTexImage1DARB},
-    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2DARB,
-                          __glXDispSwap_CompressedTexImage2DARB},
-    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3DARB,
-                          __glXDispSwap_CompressedTexImage3DARB},
-    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1DARB,
-                          __glXDispSwap_CompressedTexSubImage1DARB},
-    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2DARB,
-                          __glXDispSwap_CompressedTexSubImage2DARB},
-    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3DARB,
-                          __glXDispSwap_CompressedTexSubImage3DARB},
+    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4iv,
+                          __glXDispSwap_MultiTexCoord4iv},
+    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4sv,
+                          __glXDispSwap_MultiTexCoord4sv},
+    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1D,
+                          __glXDispSwap_CompressedTexImage1D},
+    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2D,
+                          __glXDispSwap_CompressedTexImage2D},
+    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3D,
+                          __glXDispSwap_CompressedTexImage3D},
+    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1D,
+                          __glXDispSwap_CompressedTexSubImage1D},
+    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2D,
+                          __glXDispSwap_CompressedTexSubImage2D},
+    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3D,
+                          __glXDispSwap_CompressedTexSubImage3D},
     /* [ 220] =   220 */ {NULL, NULL},
     /* [ 221] =   221 */ {NULL, NULL},
     /* [ 222] =   222 */ {NULL, NULL},
@@ -631,25 +629,21 @@ static const void *Render_function_table[408][2] = {
     /* [ 226] =   226 */ {NULL, NULL},
     /* [ 227] =   227 */ {NULL, NULL},
     /* [ 228] =   228 */ {NULL, NULL},
-    /* [ 229] =   229 */ {__glXDisp_SampleCoverageARB,
-                          __glXDispSwap_SampleCoverageARB},
-    /* [ 230] =   230 */ {__glXDisp_WindowPos3fvMESA,
-                          __glXDispSwap_WindowPos3fvMESA},
-    /* [ 231] =   231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
-    /* [ 232] =   232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
-    /* [ 233] =   233 */ {__glXDisp_DrawBuffersARB,
-                          __glXDispSwap_DrawBuffersARB},
-    /* [ 234] =   234 */ {__glXDisp_ClampColorARB, __glXDispSwap_ClampColorARB},
+    /* [ 229] =   229 */ {__glXDisp_SampleCoverage,
+                          __glXDispSwap_SampleCoverage},
+    /* [ 230] =   230 */ {__glXDisp_WindowPos3fv, __glXDispSwap_WindowPos3fv},
+    /* [ 231] =   231 */ {__glXDisp_BeginQuery, __glXDispSwap_BeginQuery},
+    /* [ 232] =   232 */ {__glXDisp_EndQuery, __glXDispSwap_EndQuery},
+    /* [ 233] =   233 */ {__glXDisp_DrawBuffers, __glXDispSwap_DrawBuffers},
+    /* [ 234] =   234 */ {__glXDisp_ClampColor, __glXDispSwap_ClampColor},
     /* [ 235] =   235 */ {NULL, NULL},
     /* [ 236] =   236 */ {NULL, NULL},
-    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayerEXT,
-                          __glXDispSwap_FramebufferTextureLayerEXT},
+    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayer,
+                          __glXDispSwap_FramebufferTextureLayer},
     /* [ 238] =   238 */ {NULL, NULL},
     /* [ 239] =   239 */ {NULL, NULL},
-    /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS,
-                          __glXDispSwap_SampleMaskSGIS},
-    /* [ 241] =  2049 */ {__glXDisp_SamplePatternSGIS,
-                          __glXDispSwap_SamplePatternSGIS},
+    /* [ 240] =  2048 */ {NULL, NULL},
+    /* [ 241] =  2049 */ {NULL, NULL},
     /* [ 242] =  2050 */ {NULL, NULL},
     /* [ 243] =  2051 */ {NULL, NULL},
     /* [ 244] =  2052 */ {NULL, NULL},
@@ -668,10 +662,10 @@ static const void *Render_function_table[408][2] = {
     /* [ 254] =  2062 */ {NULL, NULL},
     /* [ 255] =  2063 */ {NULL, NULL},
     /* [ 256] =  2064 */ {NULL, NULL},
-    /* [ 257] =  2065 */ {__glXDisp_PointParameterfEXT,
-                          __glXDispSwap_PointParameterfEXT},
-    /* [ 258] =  2066 */ {__glXDisp_PointParameterfvEXT,
-                          __glXDispSwap_PointParameterfvEXT},
+    /* [ 257] =  2065 */ {__glXDisp_PointParameterf,
+                          __glXDispSwap_PointParameterf},
+    /* [ 258] =  2066 */ {__glXDisp_PointParameterfv,
+                          __glXDispSwap_PointParameterfv},
     /* [ 259] =  2067 */ {NULL, NULL},
     /* [ 260] =  2068 */ {NULL, NULL},
     /* [ 261] =  2069 */ {NULL, NULL},
@@ -722,38 +716,35 @@ static const void *Render_function_table[408][2] = {
     /* [ 291] =  4123 */ {__glXDisp_CopyTexSubImage3D,
                           __glXDispSwap_CopyTexSubImage3D},
     /* [ 292] =  4124 */ {__glXDisp_FogCoordfvEXT, __glXDispSwap_FogCoordfvEXT},
-    /* [ 293] =  4125 */ {__glXDisp_FogCoorddvEXT, __glXDispSwap_FogCoorddvEXT},
-    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bvEXT,
-                          __glXDispSwap_SecondaryColor3bvEXT},
-    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3svEXT,
-                          __glXDispSwap_SecondaryColor3svEXT},
+    /* [ 293] =  4125 */ {__glXDisp_FogCoorddv, __glXDispSwap_FogCoorddv},
+    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bv,
+                          __glXDispSwap_SecondaryColor3bv},
+    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3sv,
+                          __glXDispSwap_SecondaryColor3sv},
     /* [ 296] =  4176 */ {NULL, NULL},
     /* [ 297] =  4177 */ {NULL, NULL},
     /* [ 298] =  4178 */ {NULL, NULL},
     /* [ 299] =  4179 */ {NULL, NULL},
-    /* [ 300] =  4180 */ {__glXDisp_BindProgramNV, __glXDispSwap_BindProgramNV},
-    /* [ 301] =  4181 */ {__glXDisp_ExecuteProgramNV,
-                          __glXDispSwap_ExecuteProgramNV},
-    /* [ 302] =  4182 */ {__glXDisp_RequestResidentProgramsNV,
-                          __glXDispSwap_RequestResidentProgramsNV},
-    /* [ 303] =  4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
+    /* [ 300] =  4180 */ {__glXDisp_BindProgramARB,
+                          __glXDispSwap_BindProgramARB},
+    /* [ 301] =  4181 */ {NULL, NULL},
+    /* [ 302] =  4182 */ {NULL, NULL},
+    /* [ 303] =  4183 */ {NULL, NULL},
     /* [ 304] =  4184 */ {__glXDisp_ProgramEnvParameter4fvARB,
                           __glXDispSwap_ProgramEnvParameter4fvARB},
     /* [ 305] =  4185 */ {__glXDisp_ProgramEnvParameter4dvARB,
                           __glXDispSwap_ProgramEnvParameter4dvARB},
-    /* [ 306] =  4186 */ {__glXDisp_ProgramParameters4fvNV,
-                          __glXDispSwap_ProgramParameters4fvNV},
-    /* [ 307] =  4187 */ {__glXDisp_ProgramParameters4dvNV,
-                          __glXDispSwap_ProgramParameters4dvNV},
-    /* [ 308] =  4188 */ {__glXDisp_TrackMatrixNV, __glXDispSwap_TrackMatrixNV},
-    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1svARB,
-                          __glXDispSwap_VertexAttrib1svARB},
-    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2svARB,
-                          __glXDispSwap_VertexAttrib2svARB},
-    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3svARB,
-                          __glXDispSwap_VertexAttrib3svARB},
-    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4svARB,
-                          __glXDispSwap_VertexAttrib4svARB},
+    /* [ 306] =  4186 */ {NULL, NULL},
+    /* [ 307] =  4187 */ {NULL, NULL},
+    /* [ 308] =  4188 */ {NULL, NULL},
+    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1sv,
+                          __glXDispSwap_VertexAttrib1sv},
+    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2sv,
+                          __glXDispSwap_VertexAttrib2sv},
+    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3sv,
+                          __glXDispSwap_VertexAttrib3sv},
+    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4sv,
+                          __glXDispSwap_VertexAttrib4sv},
     /* [ 313] =  4193 */ {__glXDisp_VertexAttrib1fvARB,
                           __glXDispSwap_VertexAttrib1fvARB},
     /* [ 314] =  4194 */ {__glXDisp_VertexAttrib2fvARB,
@@ -762,16 +753,16 @@ static const void *Render_function_table[408][2] = {
                           __glXDispSwap_VertexAttrib3fvARB},
     /* [ 316] =  4196 */ {__glXDisp_VertexAttrib4fvARB,
                           __glXDispSwap_VertexAttrib4fvARB},
-    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dvARB,
-                          __glXDispSwap_VertexAttrib1dvARB},
-    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dvARB,
-                          __glXDispSwap_VertexAttrib2dvARB},
-    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dvARB,
-                          __glXDispSwap_VertexAttrib3dvARB},
-    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dvARB,
-                          __glXDispSwap_VertexAttrib4dvARB},
-    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4NubvARB,
-                          __glXDispSwap_VertexAttrib4NubvARB},
+    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dv,
+                          __glXDispSwap_VertexAttrib1dv},
+    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dv,
+                          __glXDispSwap_VertexAttrib2dv},
+    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dv,
+                          __glXDispSwap_VertexAttrib3dv},
+    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dv,
+                          __glXDispSwap_VertexAttrib4dv},
+    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4Nubv,
+                          __glXDispSwap_VertexAttrib4Nubv},
     /* [ 322] =  4202 */ {__glXDisp_VertexAttribs1svNV,
                           __glXDispSwap_VertexAttribs1svNV},
     /* [ 323] =  4203 */ {__glXDisp_VertexAttribs2svNV,
@@ -804,82 +795,80 @@ static const void *Render_function_table[408][2] = {
                           __glXDispSwap_ProgramLocalParameter4dvARB},
     /* [ 337] =  4217 */ {__glXDisp_ProgramStringARB,
                           __glXDispSwap_ProgramStringARB},
-    /* [ 338] =  4218 */ {__glXDisp_ProgramNamedParameter4fvNV,
-                          __glXDispSwap_ProgramNamedParameter4fvNV},
-    /* [ 339] =  4219 */ {__glXDisp_ProgramNamedParameter4dvNV,
-                          __glXDispSwap_ProgramNamedParameter4dvNV},
+    /* [ 338] =  4218 */ {NULL, NULL},
+    /* [ 339] =  4219 */ {NULL, NULL},
     /* [ 340] =  4220 */ {__glXDisp_ActiveStencilFaceEXT,
                           __glXDispSwap_ActiveStencilFaceEXT},
-    /* [ 341] =  4221 */ {__glXDisp_PointParameteriNV,
-                          __glXDispSwap_PointParameteriNV},
-    /* [ 342] =  4222 */ {__glXDisp_PointParameterivNV,
-                          __glXDispSwap_PointParameterivNV},
+    /* [ 341] =  4221 */ {__glXDisp_PointParameteri,
+                          __glXDispSwap_PointParameteri},
+    /* [ 342] =  4222 */ {__glXDisp_PointParameteriv,
+                          __glXDispSwap_PointParameteriv},
     /* [ 343] =  4223 */ {NULL, NULL},
     /* [ 344] =  4224 */ {NULL, NULL},
     /* [ 345] =  4225 */ {NULL, NULL},
     /* [ 346] =  4226 */ {NULL, NULL},
     /* [ 347] =  4227 */ {NULL, NULL},
-    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparateEXT,
-                          __glXDispSwap_BlendEquationSeparateEXT},
+    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparate,
+                          __glXDispSwap_BlendEquationSeparate},
     /* [ 349] =  4229 */ {NULL, NULL},
-    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bvARB,
-                          __glXDispSwap_VertexAttrib4bvARB},
-    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4ivARB,
-                          __glXDispSwap_VertexAttrib4ivARB},
-    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubvARB,
-                          __glXDispSwap_VertexAttrib4ubvARB},
-    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usvARB,
-                          __glXDispSwap_VertexAttrib4usvARB},
-    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uivARB,
-                          __glXDispSwap_VertexAttrib4uivARB},
-    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4NbvARB,
-                          __glXDispSwap_VertexAttrib4NbvARB},
-    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4NsvARB,
-                          __glXDispSwap_VertexAttrib4NsvARB},
-    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4NivARB,
-                          __glXDispSwap_VertexAttrib4NivARB},
-    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4NusvARB,
-                          __glXDispSwap_VertexAttrib4NusvARB},
-    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4NuivARB,
-                          __glXDispSwap_VertexAttrib4NuivARB},
-    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffersEXT,
-                          __glXDispSwap_DeleteFramebuffersEXT},
-    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1DEXT,
-                          __glXDispSwap_FramebufferTexture1DEXT},
-    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2DEXT,
-                          __glXDispSwap_FramebufferTexture2DEXT},
-    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3DEXT,
-                          __glXDispSwap_FramebufferTexture3DEXT},
-    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbufferEXT,
-                          __glXDispSwap_FramebufferRenderbufferEXT},
-    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmapEXT,
-                          __glXDispSwap_GenerateMipmapEXT},
+    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bv,
+                          __glXDispSwap_VertexAttrib4bv},
+    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4iv,
+                          __glXDispSwap_VertexAttrib4iv},
+    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubv,
+                          __glXDispSwap_VertexAttrib4ubv},
+    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usv,
+                          __glXDispSwap_VertexAttrib4usv},
+    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uiv,
+                          __glXDispSwap_VertexAttrib4uiv},
+    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4Nbv,
+                          __glXDispSwap_VertexAttrib4Nbv},
+    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4Nsv,
+                          __glXDispSwap_VertexAttrib4Nsv},
+    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4Niv,
+                          __glXDispSwap_VertexAttrib4Niv},
+    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4Nusv,
+                          __glXDispSwap_VertexAttrib4Nusv},
+    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4Nuiv,
+                          __glXDispSwap_VertexAttrib4Nuiv},
+    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffers,
+                          __glXDispSwap_DeleteFramebuffers},
+    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1D,
+                          __glXDispSwap_FramebufferTexture1D},
+    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2D,
+                          __glXDispSwap_FramebufferTexture2D},
+    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3D,
+                          __glXDispSwap_FramebufferTexture3D},
+    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbuffer,
+                          __glXDispSwap_FramebufferRenderbuffer},
+    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmap,
+                          __glXDispSwap_GenerateMipmap},
     /* [ 366] =  4326 */ {NULL, NULL},
     /* [ 367] =  4327 */ {NULL, NULL},
     /* [ 368] =  4328 */ {NULL, NULL},
     /* [ 369] =  4329 */ {NULL, NULL},
-    /* [ 370] =  4330 */ {__glXDisp_BlitFramebufferEXT,
-                          __glXDispSwap_BlitFramebufferEXT},
+    /* [ 370] =  4330 */ {__glXDisp_BlitFramebuffer,
+                          __glXDispSwap_BlitFramebuffer},
     /* [ 371] =  4331 */ {__glXDisp_RenderbufferStorageMultisample,
                           __glXDispSwap_RenderbufferStorageMultisample},
     /* [ 372] =  4332 */ {NULL, NULL},
     /* [ 373] =  4333 */ {NULL, NULL},
     /* [ 374] =  4334 */ {NULL, NULL},
     /* [ 375] =  4335 */ {NULL, NULL},
-    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3ivEXT,
-                          __glXDispSwap_SecondaryColor3ivEXT},
+    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3iv,
+                          __glXDispSwap_SecondaryColor3iv},
     /* [ 377] =  4129 */ {__glXDisp_SecondaryColor3fvEXT,
                           __glXDispSwap_SecondaryColor3fvEXT},
-    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dvEXT,
-                          __glXDispSwap_SecondaryColor3dvEXT},
-    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubvEXT,
-                          __glXDispSwap_SecondaryColor3ubvEXT},
-    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usvEXT,
-                          __glXDispSwap_SecondaryColor3usvEXT},
-    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uivEXT,
-                          __glXDispSwap_SecondaryColor3uivEXT},
-    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparateEXT,
-                          __glXDispSwap_BlendFuncSeparateEXT},
+    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dv,
+                          __glXDispSwap_SecondaryColor3dv},
+    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubv,
+                          __glXDispSwap_SecondaryColor3ubv},
+    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usv,
+                          __glXDispSwap_SecondaryColor3usv},
+    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uiv,
+                          __glXDispSwap_SecondaryColor3uiv},
+    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparate,
+                          __glXDispSwap_BlendFuncSeparate},
     /* [ 383] =  4135 */ {NULL, NULL},
     /* [ 384] =  4264 */ {NULL, NULL},
     /* [ 385] =  4265 */ {__glXDisp_VertexAttrib1svNV,
@@ -914,14 +903,14 @@ static const void *Render_function_table[408][2] = {
     /* [ 401] =  4313 */ {NULL, NULL},
     /* [ 402] =  4314 */ {NULL, NULL},
     /* [ 403] =  4315 */ {NULL, NULL},
-    /* [ 404] =  4316 */ {__glXDisp_BindRenderbufferEXT,
-                          __glXDispSwap_BindRenderbufferEXT},
-    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffersEXT,
-                          __glXDispSwap_DeleteRenderbuffersEXT},
-    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorageEXT,
-                          __glXDispSwap_RenderbufferStorageEXT},
-    /* [ 407] =  4319 */ {__glXDisp_BindFramebufferEXT,
-                          __glXDispSwap_BindFramebufferEXT},
+    /* [ 404] =  4316 */ {__glXDisp_BindRenderbuffer,
+                          __glXDispSwap_BindRenderbuffer},
+    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffers,
+                          __glXDispSwap_DeleteRenderbuffers},
+    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorage,
+                          __glXDispSwap_RenderbufferStorage},
+    /* [ 407] =  4319 */ {__glXDisp_BindFramebuffer,
+                          __glXDispSwap_BindFramebuffer},
 };
 
 static const int_fast16_t Render_size_table[408][2] = {
@@ -1165,8 +1154,8 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [237] =   237 */ {24, ~0},
     /* [238] =   238 */ {0, ~0},
     /* [239] =   239 */ {0, ~0},
-    /* [240] =  2048 */ {12, ~0},
-    /* [241] =  2049 */ {8, ~0},
+    /* [240] =  2048 */ {0, ~0},
+    /* [241] =  2049 */ {0, ~0},
     /* [242] =  2050 */ {0, ~0},
     /* [243] =  2051 */ {0, ~0},
     /* [244] =  2052 */ {0, ~0},
@@ -1226,14 +1215,14 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [298] =  4178 */ {0, ~0},
     /* [299] =  4179 */ {0, ~0},
     /* [300] =  4180 */ {12, ~0},
-    /* [301] =  4181 */ {28, ~0},
-    /* [302] =  4182 */ {8, 51},
-    /* [303] =  4183 */ {16, 52},
+    /* [301] =  4181 */ {0, ~0},
+    /* [302] =  4182 */ {0, ~0},
+    /* [303] =  4183 */ {0, ~0},
     /* [304] =  4184 */ {28, ~0},
     /* [305] =  4185 */ {44, ~0},
-    /* [306] =  4186 */ {16, 53},
-    /* [307] =  4187 */ {16, 54},
-    /* [308] =  4188 */ {20, ~0},
+    /* [306] =  4186 */ {0, ~0},
+    /* [307] =  4187 */ {0, ~0},
+    /* [308] =  4188 */ {0, ~0},
     /* [309] =  4189 */ {12, ~0},
     /* [310] =  4190 */ {12, ~0},
     /* [311] =  4191 */ {16, ~0},
@@ -1247,27 +1236,27 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [319] =  4199 */ {32, ~0},
     /* [320] =  4200 */ {40, ~0},
     /* [321] =  4201 */ {12, ~0},
-    /* [322] =  4202 */ {12, 55},
-    /* [323] =  4203 */ {12, 56},
-    /* [324] =  4204 */ {12, 57},
-    /* [325] =  4205 */ {12, 58},
-    /* [326] =  4206 */ {12, 59},
-    /* [327] =  4207 */ {12, 60},
-    /* [328] =  4208 */ {12, 61},
-    /* [329] =  4209 */ {12, 62},
-    /* [330] =  4210 */ {12, 63},
-    /* [331] =  4211 */ {12, 64},
-    /* [332] =  4212 */ {12, 65},
-    /* [333] =  4213 */ {12, 66},
-    /* [334] =  4214 */ {12, 67},
+    /* [322] =  4202 */ {12, 51},
+    /* [323] =  4203 */ {12, 52},
+    /* [324] =  4204 */ {12, 53},
+    /* [325] =  4205 */ {12, 54},
+    /* [326] =  4206 */ {12, 55},
+    /* [327] =  4207 */ {12, 56},
+    /* [328] =  4208 */ {12, 57},
+    /* [329] =  4209 */ {12, 58},
+    /* [330] =  4210 */ {12, 59},
+    /* [331] =  4211 */ {12, 60},
+    /* [332] =  4212 */ {12, 61},
+    /* [333] =  4213 */ {12, 62},
+    /* [334] =  4214 */ {12, 63},
     /* [335] =  4215 */ {28, ~0},
     /* [336] =  4216 */ {44, ~0},
-    /* [337] =  4217 */ {16, 68},
-    /* [338] =  4218 */ {28, 69},
-    /* [339] =  4219 */ {44, 70},
+    /* [337] =  4217 */ {16, 64},
+    /* [338] =  4218 */ {0, ~0},
+    /* [339] =  4219 */ {0, ~0},
     /* [340] =  4220 */ {8, ~0},
     /* [341] =  4221 */ {12, ~0},
-    /* [342] =  4222 */ {8, 71},
+    /* [342] =  4222 */ {8, 65},
     /* [343] =  4223 */ {0, ~0},
     /* [344] =  4224 */ {0, ~0},
     /* [345] =  4225 */ {0, ~0},
@@ -1285,7 +1274,7 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [357] =  4237 */ {24, ~0},
     /* [358] =  4238 */ {16, ~0},
     /* [359] =  4239 */ {24, ~0},
-    /* [360] =  4320 */ {8, 72},
+    /* [360] =  4320 */ {8, 66},
     /* [361] =  4321 */ {24, ~0},
     /* [362] =  4322 */ {24, ~0},
     /* [363] =  4323 */ {28, ~0},
@@ -1330,12 +1319,12 @@ static const int_fast16_t Render_size_table[408][2] = {
     /* [402] =  4314 */ {0, ~0},
     /* [403] =  4315 */ {0, ~0},
     /* [404] =  4316 */ {12, ~0},
-    /* [405] =  4317 */ {8, 73},
+    /* [405] =  4317 */ {8, 67},
     /* [406] =  4318 */ {20, ~0},
     /* [407] =  4319 */ {12, ~0},
 };
 
-static const gl_proto_size_func Render_size_func_table[74] = {
+static const gl_proto_size_func Render_size_func_table[68] = {
     __glXCallListsReqSize,
     __glXBitmapReqSize,
     __glXFogfvReqSize,
@@ -1366,17 +1355,17 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXDrawPixelsReqSize,
     __glXDrawArraysReqSize,
     __glXColorSubTableReqSize,
-    __glXCompressedTexImage1DARBReqSize,
-    __glXCompressedTexImage2DARBReqSize,
-    __glXCompressedTexImage3DARBReqSize,
-    __glXCompressedTexSubImage1DARBReqSize,
-    __glXCompressedTexSubImage2DARBReqSize,
-    __glXCompressedTexSubImage3DARBReqSize,
-    __glXDrawBuffersARBReqSize,
+    __glXCompressedTexImage1DReqSize,
+    __glXCompressedTexImage2DReqSize,
+    __glXCompressedTexImage3DReqSize,
+    __glXCompressedTexSubImage1DReqSize,
+    __glXCompressedTexSubImage2DReqSize,
+    __glXCompressedTexSubImage3DReqSize,
+    __glXDrawBuffersReqSize,
     __glXColorTableReqSize,
     __glXColorTableParameterfvReqSize,
     __glXColorTableParameterivReqSize,
-    __glXPointParameterfvEXTReqSize,
+    __glXPointParameterfvReqSize,
     __glXTexSubImage1DReqSize,
     __glXTexSubImage2DReqSize,
     __glXConvolutionFilter1DReqSize,
@@ -1387,10 +1376,6 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXTexImage3DReqSize,
     __glXTexSubImage3DReqSize,
     __glXPrioritizeTexturesReqSize,
-    __glXRequestResidentProgramsNVReqSize,
-    __glXLoadProgramNVReqSize,
-    __glXProgramParameters4fvNVReqSize,
-    __glXProgramParameters4dvNVReqSize,
     __glXVertexAttribs1svNVReqSize,
     __glXVertexAttribs2svNVReqSize,
     __glXVertexAttribs3svNVReqSize,
@@ -1405,11 +1390,9 @@ static const gl_proto_size_func Render_size_func_table[74] = {
     __glXVertexAttribs4dvNVReqSize,
     __glXVertexAttribs4ubvNVReqSize,
     __glXProgramStringARBReqSize,
-    __glXProgramNamedParameter4fvNVReqSize,
-    __glXProgramNamedParameter4dvNVReqSize,
-    __glXPointParameterivNVReqSize,
-    __glXDeleteFramebuffersEXTReqSize,
-    __glXDeleteRenderbuffersEXTReqSize,
+    __glXPointParameterivReqSize,
+    __glXDeleteFramebuffersReqSize,
+    __glXDeleteRenderbuffersReqSize,
 };
 
 const struct __glXDispatchInfo Render_dispatch_info = {
@@ -1711,19 +1694,13 @@ static const void *VendorPriv_function_table[104][2] = {
                          __glXDispSwap_GetProgramEnvParameterfvARB},
     /* [ 25] =  1297 */ {__glXDisp_GetProgramEnvParameterdvARB,
                          __glXDispSwap_GetProgramEnvParameterdvARB},
-    /* [ 26] =  1298 */ {__glXDisp_GetProgramivNV,
-                         __glXDispSwap_GetProgramivNV},
-    /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV,
-                         __glXDispSwap_GetProgramStringNV},
-    /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV,
-                         __glXDispSwap_GetTrackMatrixivNV},
-    /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdvARB,
-                         __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvARB,
-                         __glXDispSwap_GetVertexAttribfvARB},
-    /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV,
-                         __glXDispSwap_GetVertexAttribivNV},
-    /* [ 32] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
+    /* [ 26] =  1298 */ {NULL, NULL},
+    /* [ 27] =  1299 */ {NULL, NULL},
+    /* [ 28] =  1300 */ {NULL, NULL},
+    /* [ 29] =  1301 */ {NULL, NULL},
+    /* [ 30] =  1302 */ {NULL, NULL},
+    /* [ 31] =  1303 */ {NULL, NULL},
+    /* [ 32] =  1304 */ {__glXDisp_IsProgramARB, __glXDispSwap_IsProgramARB},
     /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB,
                          __glXDispSwap_GetProgramLocalParameterfvARB},
     /* [ 34] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB,
@@ -1733,20 +1710,18 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 36] =  1308 */ {__glXDisp_GetProgramStringARB,
                          __glXDispSwap_GetProgramStringARB},
     /* [ 37] =  1309 */ {NULL, NULL},
-    /* [ 38] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV,
-                         __glXDispSwap_GetProgramNamedParameterfvNV},
-    /* [ 39] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV,
-                         __glXDispSwap_GetProgramNamedParameterdvNV},
+    /* [ 38] =  1310 */ {NULL, NULL},
+    /* [ 39] =  1311 */ {NULL, NULL},
     /* [ 40] =  1288 */ {NULL, NULL},
     /* [ 41] =  1289 */ {NULL, NULL},
     /* [ 42] =  1290 */ {NULL, NULL},
     /* [ 43] =  1291 */ {NULL, NULL},
     /* [ 44] =  1292 */ {NULL, NULL},
-    /* [ 45] =  1293 */ {__glXDisp_AreProgramsResidentNV,
-                         __glXDispSwap_AreProgramsResidentNV},
-    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsNV,
-                         __glXDispSwap_DeleteProgramsNV},
-    /* [ 47] =  1295 */ {__glXDisp_GenProgramsNV, __glXDispSwap_GenProgramsNV},
+    /* [ 45] =  1293 */ {NULL, NULL},
+    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsARB,
+                         __glXDispSwap_DeleteProgramsARB},
+    /* [ 47] =  1295 */ {__glXDisp_GenProgramsARB,
+                         __glXDispSwap_GenProgramsARB},
     /* [ 48] =  1328 */ {NULL, NULL},
     /* [ 49] =  1329 */ {NULL, NULL},
     /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT,
@@ -1763,20 +1738,19 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 59] =  1419 */ {NULL, NULL},
     /* [ 60] =  1420 */ {NULL, NULL},
     /* [ 61] =  1421 */ {NULL, NULL},
-    /* [ 62] =  1422 */ {__glXDisp_IsRenderbufferEXT,
-                         __glXDispSwap_IsRenderbufferEXT},
-    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffersEXT,
-                         __glXDispSwap_GenRenderbuffersEXT},
-    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameterivEXT,
-                         __glXDispSwap_GetRenderbufferParameterivEXT},
-    /* [ 65] =  1425 */ {__glXDisp_IsFramebufferEXT,
-                         __glXDispSwap_IsFramebufferEXT},
-    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffersEXT,
-                         __glXDispSwap_GenFramebuffersEXT},
-    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatusEXT,
-                         __glXDispSwap_CheckFramebufferStatusEXT},
-    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameterivEXT,
-                         __glXDispSwap_GetFramebufferAttachmentParameterivEXT},
+    /* [ 62] =  1422 */ {__glXDisp_IsRenderbuffer,
+                         __glXDispSwap_IsRenderbuffer},
+    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffers,
+                         __glXDispSwap_GenRenderbuffers},
+    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameteriv,
+                         __glXDispSwap_GetRenderbufferParameteriv},
+    /* [ 65] =  1425 */ {__glXDisp_IsFramebuffer, __glXDispSwap_IsFramebuffer},
+    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffers,
+                         __glXDispSwap_GenFramebuffers},
+    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatus,
+                         __glXDispSwap_CheckFramebufferStatus},
+    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameteriv,
+                         __glXDispSwap_GetFramebufferAttachmentParameteriv},
     /* [ 69] =  1429 */ {NULL, NULL},
     /* [ 70] =  1430 */ {NULL, NULL},
     /* [ 71] =  1431 */ {NULL, NULL},