glx: Regenerate GL API files from Mesa

Adam reviewed the underlying changes in the Mesa generated scripts.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

1 files changed, 113 insertions, 102 deletions

diff --git a/glx/indirect_table.c b/glx/indirect_table.c
index 01d1da3f8..d08f1f168 100644
--- a/glx/indirect_table.c
+++ b/glx/indirect_table.c
@@ -107,9 +107,9 @@ static const void *Single_function_table[112][2] = {
     /* [ 30] =    30 */ {__glXDisp_ChangeDrawableAttributes, __glXDispSwap_ChangeDrawableAttributes},
     /* [ 31] =    31 */ {__glXDisp_CreateWindow, __glXDispSwap_CreateWindow},
     /* [ 32] =    32 */ {__glXDisp_DestroyWindow, __glXDispSwap_DestroyWindow},
-    /* [ 33] =    33 */ {NULL, NULL},
-    /* [ 34] =    34 */ {NULL, NULL},
-    /* [ 35] =    35 */ {NULL, NULL},
+    /* [ 33] =    33 */ {__glXDisp_SetClientInfoARB, __glXDispSwap_SetClientInfoARB},
+    /* [ 34] =    34 */ {__glXDisp_CreateContextAttribsARB, __glXDispSwap_CreateContextAttribsARB},
+    /* [ 35] =    35 */ {__glXDisp_SetClientInfo2ARB, __glXDispSwap_SetClientInfo2ARB},
     /* [ 36] =    36 */ {NULL, NULL},
     /* [ 37] =    37 */ {NULL, NULL},
     /* [ 38] =    38 */ {NULL, NULL},
@@ -198,7 +198,7 @@ const struct __glXDispatchInfo Single_dispatch_info = {
 
 /*****************************************************************/
 /* tree depth = 8 */
-static const int_fast16_t Render_dispatch_tree[95] = {
+static const int_fast16_t Render_dispatch_tree[92] = {
     /* [0] -> opcode range [0, 8192], node depth 1 */
     2,
     5,
@@ -308,37 +308,32 @@ static const int_fast16_t Render_dispatch_tree[95] = {
     86,
     EMPTY_LEAF,
     89,
-    92,
+    LEAF(360),
     EMPTY_LEAF,
 
     /* [80] -> opcode range [4128, 4144], node depth 6 */
     1,
-    LEAF(360),
+    LEAF(376),
     EMPTY_LEAF,
 
     /* [83] -> opcode range [4256, 4272], node depth 6 */
     1,
     EMPTY_LEAF,
-    LEAF(368),
+    LEAF(384),
 
     /* [86] -> opcode range [4272, 4288], node depth 6 */
     1,
-    LEAF(376),
+    LEAF(392),
     EMPTY_LEAF,
 
     /* [89] -> opcode range [4304, 4320], node depth 6 */
     1,
     EMPTY_LEAF,
-    LEAF(384),
-
-    /* [92] -> opcode range [4320, 4336], node depth 6 */
-    1,
-    LEAF(392),
-    EMPTY_LEAF,
+    LEAF(400),
 
 };
 
-static const void *Render_function_table[400][2] = {
+static const void *Render_function_table[408][2] = {
     /* [  0] =     0 */ {NULL, NULL},
     /* [  1] =     1 */ {__glXDisp_CallList, __glXDispSwap_CallList},
     /* [  2] =     2 */ {__glXDisp_CallLists, __glXDispSwap_CallLists},
@@ -573,10 +568,10 @@ static const void *Render_function_table[400][2] = {
     /* [ 231] =   231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
     /* [ 232] =   232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
     /* [ 233] =   233 */ {__glXDisp_DrawBuffersARB, __glXDispSwap_DrawBuffersARB},
-    /* [ 234] =   234 */ {NULL, NULL},
+    /* [ 234] =   234 */ {__glXDisp_ClampColorARB, __glXDispSwap_ClampColorARB},
     /* [ 235] =   235 */ {NULL, NULL},
     /* [ 236] =   236 */ {NULL, NULL},
-    /* [ 237] =   237 */ {NULL, NULL},
+    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayerEXT, __glXDispSwap_FramebufferTextureLayerEXT},
     /* [ 238] =   238 */ {NULL, NULL},
     /* [ 239] =   239 */ {NULL, NULL},
     /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS, __glXDispSwap_SampleMaskSGIS},
@@ -699,49 +694,57 @@ static const void *Render_function_table[400][2] = {
     /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4NivARB, __glXDispSwap_VertexAttrib4NivARB},
     /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4NusvARB, __glXDispSwap_VertexAttrib4NusvARB},
     /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4NuivARB, __glXDispSwap_VertexAttrib4NuivARB},
-    /* [ 360] =  4128 */ {__glXDisp_SecondaryColor3ivEXT, __glXDispSwap_SecondaryColor3ivEXT},
-    /* [ 361] =  4129 */ {__glXDisp_SecondaryColor3fvEXT, __glXDispSwap_SecondaryColor3fvEXT},
-    /* [ 362] =  4130 */ {__glXDisp_SecondaryColor3dvEXT, __glXDispSwap_SecondaryColor3dvEXT},
-    /* [ 363] =  4131 */ {__glXDisp_SecondaryColor3ubvEXT, __glXDispSwap_SecondaryColor3ubvEXT},
-    /* [ 364] =  4132 */ {__glXDisp_SecondaryColor3usvEXT, __glXDispSwap_SecondaryColor3usvEXT},
-    /* [ 365] =  4133 */ {__glXDisp_SecondaryColor3uivEXT, __glXDispSwap_SecondaryColor3uivEXT},
-    /* [ 366] =  4134 */ {__glXDisp_BlendFuncSeparateEXT, __glXDispSwap_BlendFuncSeparateEXT},
-    /* [ 367] =  4135 */ {NULL, NULL},
-    /* [ 368] =  4264 */ {NULL, NULL},
-    /* [ 369] =  4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV},
-    /* [ 370] =  4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV},
-    /* [ 371] =  4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV},
-    /* [ 372] =  4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV},
-    /* [ 373] =  4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV},
-    /* [ 374] =  4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV},
-    /* [ 375] =  4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV},
-    /* [ 376] =  4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV},
-    /* [ 377] =  4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV},
-    /* [ 378] =  4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV},
-    /* [ 379] =  4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV},
-    /* [ 380] =  4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV},
-    /* [ 381] =  4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV},
-    /* [ 382] =  4278 */ {NULL, NULL},
-    /* [ 383] =  4279 */ {NULL, NULL},
-    /* [ 384] =  4312 */ {NULL, NULL},
-    /* [ 385] =  4313 */ {NULL, NULL},
-    /* [ 386] =  4314 */ {NULL, NULL},
-    /* [ 387] =  4315 */ {NULL, NULL},
-    /* [ 388] =  4316 */ {__glXDisp_BindRenderbufferEXT, __glXDispSwap_BindRenderbufferEXT},
-    /* [ 389] =  4317 */ {__glXDisp_DeleteRenderbuffersEXT, __glXDispSwap_DeleteRenderbuffersEXT},
-    /* [ 390] =  4318 */ {__glXDisp_RenderbufferStorageEXT, __glXDispSwap_RenderbufferStorageEXT},
-    /* [ 391] =  4319 */ {__glXDisp_BindFramebufferEXT, __glXDispSwap_BindFramebufferEXT},
-    /* [ 392] =  4320 */ {__glXDisp_DeleteFramebuffersEXT, __glXDispSwap_DeleteFramebuffersEXT},
-    /* [ 393] =  4321 */ {__glXDisp_FramebufferTexture1DEXT, __glXDispSwap_FramebufferTexture1DEXT},
-    /* [ 394] =  4322 */ {__glXDisp_FramebufferTexture2DEXT, __glXDispSwap_FramebufferTexture2DEXT},
-    /* [ 395] =  4323 */ {__glXDisp_FramebufferTexture3DEXT, __glXDispSwap_FramebufferTexture3DEXT},
-    /* [ 396] =  4324 */ {__glXDisp_FramebufferRenderbufferEXT, __glXDispSwap_FramebufferRenderbufferEXT},
-    /* [ 397] =  4325 */ {__glXDisp_GenerateMipmapEXT, __glXDispSwap_GenerateMipmapEXT},
-    /* [ 398] =  4326 */ {NULL, NULL},
-    /* [ 399] =  4327 */ {NULL, NULL},
+    /* [ 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},
+    /* [ 366] =  4326 */ {NULL, NULL},
+    /* [ 367] =  4327 */ {NULL, NULL},
+    /* [ 368] =  4328 */ {NULL, NULL},
+    /* [ 369] =  4329 */ {NULL, NULL},
+    /* [ 370] =  4330 */ {__glXDisp_BlitFramebufferEXT, __glXDispSwap_BlitFramebufferEXT},
+    /* [ 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},
+    /* [ 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},
+    /* [ 383] =  4135 */ {NULL, NULL},
+    /* [ 384] =  4264 */ {NULL, NULL},
+    /* [ 385] =  4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV},
+    /* [ 386] =  4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV},
+    /* [ 387] =  4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV},
+    /* [ 388] =  4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV},
+    /* [ 389] =  4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV},
+    /* [ 390] =  4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV},
+    /* [ 391] =  4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV},
+    /* [ 392] =  4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV},
+    /* [ 393] =  4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV},
+    /* [ 394] =  4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV},
+    /* [ 395] =  4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV},
+    /* [ 396] =  4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV},
+    /* [ 397] =  4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV},
+    /* [ 398] =  4278 */ {NULL, NULL},
+    /* [ 399] =  4279 */ {NULL, NULL},
+    /* [ 400] =  4312 */ {NULL, NULL},
+    /* [ 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},
 };
 
-static const int_fast16_t Render_size_table[400][2] = {
+static const int_fast16_t Render_size_table[408][2] = {
     /* [  0] =     0 */ {  0, ~0},
     /* [  1] =     1 */ {  8, ~0},
     /* [  2] =     2 */ { 12,  0},
@@ -976,10 +979,10 @@ static const int_fast16_t Render_size_table[400][2] = {
     /* [231] =   231 */ { 12, ~0},
     /* [232] =   232 */ {  8, ~0},
     /* [233] =   233 */ {  8, 36},
-    /* [234] =   234 */ {  0, ~0},
+    /* [234] =   234 */ { 12, ~0},
     /* [235] =   235 */ {  0, ~0},
     /* [236] =   236 */ {  0, ~0},
-    /* [237] =   237 */ {  0, ~0},
+    /* [237] =   237 */ { 24, ~0},
     /* [238] =   238 */ {  0, ~0},
     /* [239] =   239 */ {  0, ~0},
     /* [240] =  2048 */ { 12, ~0},
@@ -1102,46 +1105,54 @@ static const int_fast16_t Render_size_table[400][2] = {
     /* [357] =  4237 */ { 24, ~0},
     /* [358] =  4238 */ { 16, ~0},
     /* [359] =  4239 */ { 24, ~0},
-    /* [360] =  4128 */ { 16, ~0},
-    /* [361] =  4129 */ { 16, ~0},
-    /* [362] =  4130 */ { 28, ~0},
-    /* [363] =  4131 */ {  8, ~0},
-    /* [364] =  4132 */ { 12, ~0},
-    /* [365] =  4133 */ { 16, ~0},
-    /* [366] =  4134 */ { 20, ~0},
-    /* [367] =  4135 */ {  0, ~0},
-    /* [368] =  4264 */ {  0, ~0},
-    /* [369] =  4265 */ { 12, ~0},
-    /* [370] =  4266 */ { 12, ~0},
-    /* [371] =  4267 */ { 16, ~0},
-    /* [372] =  4268 */ { 16, ~0},
-    /* [373] =  4269 */ { 12, ~0},
-    /* [374] =  4270 */ { 16, ~0},
-    /* [375] =  4271 */ { 20, ~0},
-    /* [376] =  4272 */ { 24, ~0},
-    /* [377] =  4273 */ { 16, ~0},
-    /* [378] =  4274 */ { 24, ~0},
-    /* [379] =  4275 */ { 32, ~0},
-    /* [380] =  4276 */ { 40, ~0},
-    /* [381] =  4277 */ { 12, ~0},
-    /* [382] =  4278 */ {  0, ~0},
-    /* [383] =  4279 */ {  0, ~0},
-    /* [384] =  4312 */ {  0, ~0},
-    /* [385] =  4313 */ {  0, ~0},
-    /* [386] =  4314 */ {  0, ~0},
-    /* [387] =  4315 */ {  0, ~0},
-    /* [388] =  4316 */ { 12, ~0},
-    /* [389] =  4317 */ {  8, 72},
-    /* [390] =  4318 */ { 20, ~0},
-    /* [391] =  4319 */ { 12, ~0},
-    /* [392] =  4320 */ {  8, 73},
-    /* [393] =  4321 */ { 24, ~0},
-    /* [394] =  4322 */ { 24, ~0},
-    /* [395] =  4323 */ { 28, ~0},
-    /* [396] =  4324 */ { 20, ~0},
-    /* [397] =  4325 */ {  8, ~0},
-    /* [398] =  4326 */ {  0, ~0},
-    /* [399] =  4327 */ {  0, ~0},
+    /* [360] =  4320 */ {  8, 72},
+    /* [361] =  4321 */ { 24, ~0},
+    /* [362] =  4322 */ { 24, ~0},
+    /* [363] =  4323 */ { 28, ~0},
+    /* [364] =  4324 */ { 20, ~0},
+    /* [365] =  4325 */ {  8, ~0},
+    /* [366] =  4326 */ {  0, ~0},
+    /* [367] =  4327 */ {  0, ~0},
+    /* [368] =  4328 */ {  0, ~0},
+    /* [369] =  4329 */ {  0, ~0},
+    /* [370] =  4330 */ { 44, ~0},
+    /* [371] =  4331 */ { 24, ~0},
+    /* [372] =  4332 */ {  0, ~0},
+    /* [373] =  4333 */ {  0, ~0},
+    /* [374] =  4334 */ {  0, ~0},
+    /* [375] =  4335 */ {  0, ~0},
+    /* [376] =  4128 */ { 16, ~0},
+    /* [377] =  4129 */ { 16, ~0},
+    /* [378] =  4130 */ { 28, ~0},
+    /* [379] =  4131 */ {  8, ~0},
+    /* [380] =  4132 */ { 12, ~0},
+    /* [381] =  4133 */ { 16, ~0},
+    /* [382] =  4134 */ { 20, ~0},
+    /* [383] =  4135 */ {  0, ~0},
+    /* [384] =  4264 */ {  0, ~0},
+    /* [385] =  4265 */ { 12, ~0},
+    /* [386] =  4266 */ { 12, ~0},
+    /* [387] =  4267 */ { 16, ~0},
+    /* [388] =  4268 */ { 16, ~0},
+    /* [389] =  4269 */ { 12, ~0},
+    /* [390] =  4270 */ { 16, ~0},
+    /* [391] =  4271 */ { 20, ~0},
+    /* [392] =  4272 */ { 24, ~0},
+    /* [393] =  4273 */ { 16, ~0},
+    /* [394] =  4274 */ { 24, ~0},
+    /* [395] =  4275 */ { 32, ~0},
+    /* [396] =  4276 */ { 40, ~0},
+    /* [397] =  4277 */ { 12, ~0},
+    /* [398] =  4278 */ {  0, ~0},
+    /* [399] =  4279 */ {  0, ~0},
+    /* [400] =  4312 */ {  0, ~0},
+    /* [401] =  4313 */ {  0, ~0},
+    /* [402] =  4314 */ {  0, ~0},
+    /* [403] =  4315 */ {  0, ~0},
+    /* [404] =  4316 */ { 12, ~0},
+    /* [405] =  4317 */ {  8, 73},
+    /* [406] =  4318 */ { 20, ~0},
+    /* [407] =  4319 */ { 12, ~0},
 };
 
 static const gl_proto_size_func Render_size_func_table[74] = {
@@ -1217,8 +1228,8 @@ static const gl_proto_size_func Render_size_func_table[74] = {
    __glXProgramNamedParameter4fvNVReqSize,
    __glXProgramNamedParameter4dvNVReqSize,
    __glXPointParameterivNVReqSize,
-   __glXDeleteRenderbuffersEXTReqSize,
    __glXDeleteFramebuffersEXTReqSize,
+   __glXDeleteRenderbuffersEXTReqSize,
 };
 
 const struct __glXDispatchInfo Render_dispatch_info = {
@@ -1509,7 +1520,7 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV},
     /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV},
     /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdvARB, __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV},
+    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvARB, __glXDispSwap_GetVertexAttribfvARB},
     /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV},
     /* [ 32] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
     /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB},