Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa xserver git update 9 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	xorg-server/hw/kdrive/ephyr/hostx.c

1 files changed, 335 insertions, 387 deletions

diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 6facd054b..f9533c96d 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 1140
+#define _gloffset_COUNT 1136
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -473,7 +473,7 @@
 #define _gloffset_MultiTexCoord4iv 405
 #define _gloffset_MultiTexCoord4s 406
 #define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 732
+#define driDispatchRemapTable_size 728
 SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define CompressedTexImage1D_remap_index 0
@@ -871,343 +871,339 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ViewportArrayv_remap_index 392
 #define ViewportIndexedf_remap_index 393
 #define ViewportIndexedfv_remap_index 394
-#define DebugMessageCallbackARB_remap_index 395
-#define DebugMessageControlARB_remap_index 396
-#define DebugMessageInsertARB_remap_index 397
-#define GetDebugMessageLogARB_remap_index 398
-#define GetGraphicsResetStatusARB_remap_index 399
-#define GetnColorTableARB_remap_index 400
-#define GetnCompressedTexImageARB_remap_index 401
-#define GetnConvolutionFilterARB_remap_index 402
-#define GetnHistogramARB_remap_index 403
-#define GetnMapdvARB_remap_index 404
-#define GetnMapfvARB_remap_index 405
-#define GetnMapivARB_remap_index 406
-#define GetnMinmaxARB_remap_index 407
-#define GetnPixelMapfvARB_remap_index 408
-#define GetnPixelMapuivARB_remap_index 409
-#define GetnPixelMapusvARB_remap_index 410
-#define GetnPolygonStippleARB_remap_index 411
-#define GetnSeparableFilterARB_remap_index 412
-#define GetnTexImageARB_remap_index 413
-#define GetnUniformdvARB_remap_index 414
-#define GetnUniformfvARB_remap_index 415
-#define GetnUniformivARB_remap_index 416
-#define GetnUniformuivARB_remap_index 417
-#define ReadnPixelsARB_remap_index 418
-#define DrawArraysInstancedBaseInstance_remap_index 419
-#define DrawElementsInstancedBaseInstance_remap_index 420
-#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 421
-#define DrawTransformFeedbackInstanced_remap_index 422
-#define DrawTransformFeedbackStreamInstanced_remap_index 423
-#define GetInternalformativ_remap_index 424
-#define GetActiveAtomicCounterBufferiv_remap_index 425
-#define BindImageTexture_remap_index 426
-#define MemoryBarrier_remap_index 427
-#define TexStorage1D_remap_index 428
-#define TexStorage2D_remap_index 429
-#define TexStorage3D_remap_index 430
-#define TextureStorage1DEXT_remap_index 431
-#define TextureStorage2DEXT_remap_index 432
-#define TextureStorage3DEXT_remap_index 433
-#define ClearBufferData_remap_index 434
-#define ClearBufferSubData_remap_index 435
-#define DispatchCompute_remap_index 436
-#define DispatchComputeIndirect_remap_index 437
-#define TextureView_remap_index 438
-#define BindVertexBuffer_remap_index 439
-#define VertexAttribBinding_remap_index 440
-#define VertexAttribFormat_remap_index 441
-#define VertexAttribIFormat_remap_index 442
-#define VertexAttribLFormat_remap_index 443
-#define VertexBindingDivisor_remap_index 444
-#define MultiDrawArraysIndirect_remap_index 445
-#define MultiDrawElementsIndirect_remap_index 446
-#define TexBufferRange_remap_index 447
-#define TexStorage2DMultisample_remap_index 448
-#define TexStorage3DMultisample_remap_index 449
-#define BufferStorage_remap_index 450
-#define InvalidateBufferData_remap_index 451
-#define InvalidateBufferSubData_remap_index 452
-#define InvalidateFramebuffer_remap_index 453
-#define InvalidateSubFramebuffer_remap_index 454
-#define InvalidateTexImage_remap_index 455
-#define InvalidateTexSubImage_remap_index 456
-#define PolygonOffsetEXT_remap_index 457
-#define DrawTexfOES_remap_index 458
-#define DrawTexfvOES_remap_index 459
-#define DrawTexiOES_remap_index 460
-#define DrawTexivOES_remap_index 461
-#define DrawTexsOES_remap_index 462
-#define DrawTexsvOES_remap_index 463
-#define DrawTexxOES_remap_index 464
-#define DrawTexxvOES_remap_index 465
-#define PointSizePointerOES_remap_index 466
-#define QueryMatrixxOES_remap_index 467
-#define SampleMaskSGIS_remap_index 468
-#define SamplePatternSGIS_remap_index 469
-#define ColorPointerEXT_remap_index 470
-#define EdgeFlagPointerEXT_remap_index 471
-#define IndexPointerEXT_remap_index 472
-#define NormalPointerEXT_remap_index 473
-#define TexCoordPointerEXT_remap_index 474
-#define VertexPointerEXT_remap_index 475
-#define DiscardFramebufferEXT_remap_index 476
-#define ActiveShaderProgram_remap_index 477
-#define BindProgramPipeline_remap_index 478
-#define CreateShaderProgramv_remap_index 479
-#define DeleteProgramPipelines_remap_index 480
-#define GenProgramPipelines_remap_index 481
-#define GetProgramPipelineInfoLog_remap_index 482
-#define GetProgramPipelineiv_remap_index 483
-#define IsProgramPipeline_remap_index 484
-#define LockArraysEXT_remap_index 485
-#define ProgramUniform1f_remap_index 486
-#define ProgramUniform1fv_remap_index 487
-#define ProgramUniform1i_remap_index 488
-#define ProgramUniform1iv_remap_index 489
-#define ProgramUniform1ui_remap_index 490
-#define ProgramUniform1uiv_remap_index 491
-#define ProgramUniform2f_remap_index 492
-#define ProgramUniform2fv_remap_index 493
-#define ProgramUniform2i_remap_index 494
-#define ProgramUniform2iv_remap_index 495
-#define ProgramUniform2ui_remap_index 496
-#define ProgramUniform2uiv_remap_index 497
-#define ProgramUniform3f_remap_index 498
-#define ProgramUniform3fv_remap_index 499
-#define ProgramUniform3i_remap_index 500
-#define ProgramUniform3iv_remap_index 501
-#define ProgramUniform3ui_remap_index 502
-#define ProgramUniform3uiv_remap_index 503
-#define ProgramUniform4f_remap_index 504
-#define ProgramUniform4fv_remap_index 505
-#define ProgramUniform4i_remap_index 506
-#define ProgramUniform4iv_remap_index 507
-#define ProgramUniform4ui_remap_index 508
-#define ProgramUniform4uiv_remap_index 509
-#define ProgramUniformMatrix2fv_remap_index 510
-#define ProgramUniformMatrix2x3fv_remap_index 511
-#define ProgramUniformMatrix2x4fv_remap_index 512
-#define ProgramUniformMatrix3fv_remap_index 513
-#define ProgramUniformMatrix3x2fv_remap_index 514
-#define ProgramUniformMatrix3x4fv_remap_index 515
-#define ProgramUniformMatrix4fv_remap_index 516
-#define ProgramUniformMatrix4x2fv_remap_index 517
-#define ProgramUniformMatrix4x3fv_remap_index 518
-#define UnlockArraysEXT_remap_index 519
-#define UseProgramStages_remap_index 520
-#define ValidateProgramPipeline_remap_index 521
-#define DebugMessageCallback_remap_index 522
-#define DebugMessageControl_remap_index 523
-#define DebugMessageInsert_remap_index 524
-#define GetDebugMessageLog_remap_index 525
-#define GetObjectLabel_remap_index 526
-#define GetObjectPtrLabel_remap_index 527
-#define ObjectLabel_remap_index 528
-#define ObjectPtrLabel_remap_index 529
-#define PopDebugGroup_remap_index 530
-#define PushDebugGroup_remap_index 531
-#define SecondaryColor3fEXT_remap_index 532
-#define SecondaryColor3fvEXT_remap_index 533
-#define MultiDrawElementsEXT_remap_index 534
-#define FogCoordfEXT_remap_index 535
-#define FogCoordfvEXT_remap_index 536
-#define ResizeBuffersMESA_remap_index 537
-#define WindowPos4dMESA_remap_index 538
-#define WindowPos4dvMESA_remap_index 539
-#define WindowPos4fMESA_remap_index 540
-#define WindowPos4fvMESA_remap_index 541
-#define WindowPos4iMESA_remap_index 542
-#define WindowPos4ivMESA_remap_index 543
-#define WindowPos4sMESA_remap_index 544
-#define WindowPos4svMESA_remap_index 545
-#define MultiModeDrawArraysIBM_remap_index 546
-#define MultiModeDrawElementsIBM_remap_index 547
-#define AreProgramsResidentNV_remap_index 548
-#define ExecuteProgramNV_remap_index 549
-#define GetProgramParameterdvNV_remap_index 550
-#define GetProgramParameterfvNV_remap_index 551
-#define GetProgramStringNV_remap_index 552
-#define GetProgramivNV_remap_index 553
-#define GetTrackMatrixivNV_remap_index 554
-#define GetVertexAttribdvNV_remap_index 555
-#define GetVertexAttribfvNV_remap_index 556
-#define GetVertexAttribivNV_remap_index 557
-#define LoadProgramNV_remap_index 558
-#define ProgramParameters4dvNV_remap_index 559
-#define ProgramParameters4fvNV_remap_index 560
-#define RequestResidentProgramsNV_remap_index 561
-#define TrackMatrixNV_remap_index 562
-#define VertexAttrib1dNV_remap_index 563
-#define VertexAttrib1dvNV_remap_index 564
-#define VertexAttrib1fNV_remap_index 565
-#define VertexAttrib1fvNV_remap_index 566
-#define VertexAttrib1sNV_remap_index 567
-#define VertexAttrib1svNV_remap_index 568
-#define VertexAttrib2dNV_remap_index 569
-#define VertexAttrib2dvNV_remap_index 570
-#define VertexAttrib2fNV_remap_index 571
-#define VertexAttrib2fvNV_remap_index 572
-#define VertexAttrib2sNV_remap_index 573
-#define VertexAttrib2svNV_remap_index 574
-#define VertexAttrib3dNV_remap_index 575
-#define VertexAttrib3dvNV_remap_index 576
-#define VertexAttrib3fNV_remap_index 577
-#define VertexAttrib3fvNV_remap_index 578
-#define VertexAttrib3sNV_remap_index 579
-#define VertexAttrib3svNV_remap_index 580
-#define VertexAttrib4dNV_remap_index 581
-#define VertexAttrib4dvNV_remap_index 582
-#define VertexAttrib4fNV_remap_index 583
-#define VertexAttrib4fvNV_remap_index 584
-#define VertexAttrib4sNV_remap_index 585
-#define VertexAttrib4svNV_remap_index 586
-#define VertexAttrib4ubNV_remap_index 587
-#define VertexAttrib4ubvNV_remap_index 588
-#define VertexAttribPointerNV_remap_index 589
-#define VertexAttribs1dvNV_remap_index 590
-#define VertexAttribs1fvNV_remap_index 591
-#define VertexAttribs1svNV_remap_index 592
-#define VertexAttribs2dvNV_remap_index 593
-#define VertexAttribs2fvNV_remap_index 594
-#define VertexAttribs2svNV_remap_index 595
-#define VertexAttribs3dvNV_remap_index 596
-#define VertexAttribs3fvNV_remap_index 597
-#define VertexAttribs3svNV_remap_index 598
-#define VertexAttribs4dvNV_remap_index 599
-#define VertexAttribs4fvNV_remap_index 600
-#define VertexAttribs4svNV_remap_index 601
-#define VertexAttribs4ubvNV_remap_index 602
-#define GetTexBumpParameterfvATI_remap_index 603
-#define GetTexBumpParameterivATI_remap_index 604
-#define TexBumpParameterfvATI_remap_index 605
-#define TexBumpParameterivATI_remap_index 606
-#define AlphaFragmentOp1ATI_remap_index 607
-#define AlphaFragmentOp2ATI_remap_index 608
-#define AlphaFragmentOp3ATI_remap_index 609
-#define BeginFragmentShaderATI_remap_index 610
-#define BindFragmentShaderATI_remap_index 611
-#define ColorFragmentOp1ATI_remap_index 612
-#define ColorFragmentOp2ATI_remap_index 613
-#define ColorFragmentOp3ATI_remap_index 614
-#define DeleteFragmentShaderATI_remap_index 615
-#define EndFragmentShaderATI_remap_index 616
-#define GenFragmentShadersATI_remap_index 617
-#define PassTexCoordATI_remap_index 618
-#define SampleMapATI_remap_index 619
-#define SetFragmentShaderConstantATI_remap_index 620
-#define ActiveStencilFaceEXT_remap_index 621
-#define BindVertexArrayAPPLE_remap_index 622
-#define GenVertexArraysAPPLE_remap_index 623
-#define GetProgramNamedParameterdvNV_remap_index 624
-#define GetProgramNamedParameterfvNV_remap_index 625
-#define ProgramNamedParameter4dNV_remap_index 626
-#define ProgramNamedParameter4dvNV_remap_index 627
-#define ProgramNamedParameter4fNV_remap_index 628
-#define ProgramNamedParameter4fvNV_remap_index 629
-#define PrimitiveRestartNV_remap_index 630
-#define GetTexGenxvOES_remap_index 631
-#define TexGenxOES_remap_index 632
-#define TexGenxvOES_remap_index 633
-#define DepthBoundsEXT_remap_index 634
-#define BindFramebufferEXT_remap_index 635
-#define BindRenderbufferEXT_remap_index 636
-#define BufferParameteriAPPLE_remap_index 637
-#define FlushMappedBufferRangeAPPLE_remap_index 638
-#define VertexAttribI1iEXT_remap_index 639
-#define VertexAttribI1uiEXT_remap_index 640
-#define VertexAttribI2iEXT_remap_index 641
-#define VertexAttribI2ivEXT_remap_index 642
-#define VertexAttribI2uiEXT_remap_index 643
-#define VertexAttribI2uivEXT_remap_index 644
-#define VertexAttribI3iEXT_remap_index 645
-#define VertexAttribI3ivEXT_remap_index 646
-#define VertexAttribI3uiEXT_remap_index 647
-#define VertexAttribI3uivEXT_remap_index 648
-#define VertexAttribI4iEXT_remap_index 649
-#define VertexAttribI4ivEXT_remap_index 650
-#define VertexAttribI4uiEXT_remap_index 651
-#define VertexAttribI4uivEXT_remap_index 652
-#define ClearColorIiEXT_remap_index 653
-#define ClearColorIuiEXT_remap_index 654
-#define BindBufferOffsetEXT_remap_index 655
-#define BeginPerfMonitorAMD_remap_index 656
-#define DeletePerfMonitorsAMD_remap_index 657
-#define EndPerfMonitorAMD_remap_index 658
-#define GenPerfMonitorsAMD_remap_index 659
-#define GetPerfMonitorCounterDataAMD_remap_index 660
-#define GetPerfMonitorCounterInfoAMD_remap_index 661
-#define GetPerfMonitorCounterStringAMD_remap_index 662
-#define GetPerfMonitorCountersAMD_remap_index 663
-#define GetPerfMonitorGroupStringAMD_remap_index 664
-#define GetPerfMonitorGroupsAMD_remap_index 665
-#define SelectPerfMonitorCountersAMD_remap_index 666
-#define GetObjectParameterivAPPLE_remap_index 667
-#define ObjectPurgeableAPPLE_remap_index 668
-#define ObjectUnpurgeableAPPLE_remap_index 669
-#define ActiveProgramEXT_remap_index 670
-#define CreateShaderProgramEXT_remap_index 671
-#define UseShaderProgramEXT_remap_index 672
-#define TextureBarrierNV_remap_index 673
-#define VDPAUFiniNV_remap_index 674
-#define VDPAUGetSurfaceivNV_remap_index 675
-#define VDPAUInitNV_remap_index 676
-#define VDPAUIsSurfaceNV_remap_index 677
-#define VDPAUMapSurfacesNV_remap_index 678
-#define VDPAURegisterOutputSurfaceNV_remap_index 679
-#define VDPAURegisterVideoSurfaceNV_remap_index 680
-#define VDPAUSurfaceAccessNV_remap_index 681
-#define VDPAUUnmapSurfacesNV_remap_index 682
-#define VDPAUUnregisterSurfaceNV_remap_index 683
-#define StencilFuncSeparateATI_remap_index 684
-#define ProgramEnvParameters4fvEXT_remap_index 685
-#define ProgramLocalParameters4fvEXT_remap_index 686
-#define EGLImageTargetRenderbufferStorageOES_remap_index 687
-#define EGLImageTargetTexture2DOES_remap_index 688
-#define AlphaFuncx_remap_index 689
-#define ClearColorx_remap_index 690
-#define ClearDepthx_remap_index 691
-#define Color4x_remap_index 692
-#define DepthRangex_remap_index 693
-#define Fogx_remap_index 694
-#define Fogxv_remap_index 695
-#define Frustumf_remap_index 696
-#define Frustumx_remap_index 697
-#define LightModelx_remap_index 698
-#define LightModelxv_remap_index 699
-#define Lightx_remap_index 700
-#define Lightxv_remap_index 701
-#define LineWidthx_remap_index 702
-#define LoadMatrixx_remap_index 703
-#define Materialx_remap_index 704
-#define Materialxv_remap_index 705
-#define MultMatrixx_remap_index 706
-#define MultiTexCoord4x_remap_index 707
-#define Normal3x_remap_index 708
-#define Orthof_remap_index 709
-#define Orthox_remap_index 710
-#define PointSizex_remap_index 711
-#define PolygonOffsetx_remap_index 712
-#define Rotatex_remap_index 713
-#define SampleCoveragex_remap_index 714
-#define Scalex_remap_index 715
-#define TexEnvx_remap_index 716
-#define TexEnvxv_remap_index 717
-#define TexParameterx_remap_index 718
-#define Translatex_remap_index 719
-#define ClipPlanef_remap_index 720
-#define ClipPlanex_remap_index 721
-#define GetClipPlanef_remap_index 722
-#define GetClipPlanex_remap_index 723
-#define GetFixedv_remap_index 724
-#define GetLightxv_remap_index 725
-#define GetMaterialxv_remap_index 726
-#define GetTexEnvxv_remap_index 727
-#define GetTexParameterxv_remap_index 728
-#define PointParameterx_remap_index 729
-#define PointParameterxv_remap_index 730
-#define TexParameterxv_remap_index 731
+#define GetGraphicsResetStatusARB_remap_index 395
+#define GetnColorTableARB_remap_index 396
+#define GetnCompressedTexImageARB_remap_index 397
+#define GetnConvolutionFilterARB_remap_index 398
+#define GetnHistogramARB_remap_index 399
+#define GetnMapdvARB_remap_index 400
+#define GetnMapfvARB_remap_index 401
+#define GetnMapivARB_remap_index 402
+#define GetnMinmaxARB_remap_index 403
+#define GetnPixelMapfvARB_remap_index 404
+#define GetnPixelMapuivARB_remap_index 405
+#define GetnPixelMapusvARB_remap_index 406
+#define GetnPolygonStippleARB_remap_index 407
+#define GetnSeparableFilterARB_remap_index 408
+#define GetnTexImageARB_remap_index 409
+#define GetnUniformdvARB_remap_index 410
+#define GetnUniformfvARB_remap_index 411
+#define GetnUniformivARB_remap_index 412
+#define GetnUniformuivARB_remap_index 413
+#define ReadnPixelsARB_remap_index 414
+#define DrawArraysInstancedBaseInstance_remap_index 415
+#define DrawElementsInstancedBaseInstance_remap_index 416
+#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 417
+#define DrawTransformFeedbackInstanced_remap_index 418
+#define DrawTransformFeedbackStreamInstanced_remap_index 419
+#define GetInternalformativ_remap_index 420
+#define GetActiveAtomicCounterBufferiv_remap_index 421
+#define BindImageTexture_remap_index 422
+#define MemoryBarrier_remap_index 423
+#define TexStorage1D_remap_index 424
+#define TexStorage2D_remap_index 425
+#define TexStorage3D_remap_index 426
+#define TextureStorage1DEXT_remap_index 427
+#define TextureStorage2DEXT_remap_index 428
+#define TextureStorage3DEXT_remap_index 429
+#define ClearBufferData_remap_index 430
+#define ClearBufferSubData_remap_index 431
+#define DispatchCompute_remap_index 432
+#define DispatchComputeIndirect_remap_index 433
+#define TextureView_remap_index 434
+#define BindVertexBuffer_remap_index 435
+#define VertexAttribBinding_remap_index 436
+#define VertexAttribFormat_remap_index 437
+#define VertexAttribIFormat_remap_index 438
+#define VertexAttribLFormat_remap_index 439
+#define VertexBindingDivisor_remap_index 440
+#define MultiDrawArraysIndirect_remap_index 441
+#define MultiDrawElementsIndirect_remap_index 442
+#define TexBufferRange_remap_index 443
+#define TexStorage2DMultisample_remap_index 444
+#define TexStorage3DMultisample_remap_index 445
+#define BufferStorage_remap_index 446
+#define InvalidateBufferData_remap_index 447
+#define InvalidateBufferSubData_remap_index 448
+#define InvalidateFramebuffer_remap_index 449
+#define InvalidateSubFramebuffer_remap_index 450
+#define InvalidateTexImage_remap_index 451
+#define InvalidateTexSubImage_remap_index 452
+#define PolygonOffsetEXT_remap_index 453
+#define DrawTexfOES_remap_index 454
+#define DrawTexfvOES_remap_index 455
+#define DrawTexiOES_remap_index 456
+#define DrawTexivOES_remap_index 457
+#define DrawTexsOES_remap_index 458
+#define DrawTexsvOES_remap_index 459
+#define DrawTexxOES_remap_index 460
+#define DrawTexxvOES_remap_index 461
+#define PointSizePointerOES_remap_index 462
+#define QueryMatrixxOES_remap_index 463
+#define SampleMaskSGIS_remap_index 464
+#define SamplePatternSGIS_remap_index 465
+#define ColorPointerEXT_remap_index 466
+#define EdgeFlagPointerEXT_remap_index 467
+#define IndexPointerEXT_remap_index 468
+#define NormalPointerEXT_remap_index 469
+#define TexCoordPointerEXT_remap_index 470
+#define VertexPointerEXT_remap_index 471
+#define DiscardFramebufferEXT_remap_index 472
+#define ActiveShaderProgram_remap_index 473
+#define BindProgramPipeline_remap_index 474
+#define CreateShaderProgramv_remap_index 475
+#define DeleteProgramPipelines_remap_index 476
+#define GenProgramPipelines_remap_index 477
+#define GetProgramPipelineInfoLog_remap_index 478
+#define GetProgramPipelineiv_remap_index 479
+#define IsProgramPipeline_remap_index 480
+#define LockArraysEXT_remap_index 481
+#define ProgramUniform1f_remap_index 482
+#define ProgramUniform1fv_remap_index 483
+#define ProgramUniform1i_remap_index 484
+#define ProgramUniform1iv_remap_index 485
+#define ProgramUniform1ui_remap_index 486
+#define ProgramUniform1uiv_remap_index 487
+#define ProgramUniform2f_remap_index 488
+#define ProgramUniform2fv_remap_index 489
+#define ProgramUniform2i_remap_index 490
+#define ProgramUniform2iv_remap_index 491
+#define ProgramUniform2ui_remap_index 492
+#define ProgramUniform2uiv_remap_index 493
+#define ProgramUniform3f_remap_index 494
+#define ProgramUniform3fv_remap_index 495
+#define ProgramUniform3i_remap_index 496
+#define ProgramUniform3iv_remap_index 497
+#define ProgramUniform3ui_remap_index 498
+#define ProgramUniform3uiv_remap_index 499
+#define ProgramUniform4f_remap_index 500
+#define ProgramUniform4fv_remap_index 501
+#define ProgramUniform4i_remap_index 502
+#define ProgramUniform4iv_remap_index 503
+#define ProgramUniform4ui_remap_index 504
+#define ProgramUniform4uiv_remap_index 505
+#define ProgramUniformMatrix2fv_remap_index 506
+#define ProgramUniformMatrix2x3fv_remap_index 507
+#define ProgramUniformMatrix2x4fv_remap_index 508
+#define ProgramUniformMatrix3fv_remap_index 509
+#define ProgramUniformMatrix3x2fv_remap_index 510
+#define ProgramUniformMatrix3x4fv_remap_index 511
+#define ProgramUniformMatrix4fv_remap_index 512
+#define ProgramUniformMatrix4x2fv_remap_index 513
+#define ProgramUniformMatrix4x3fv_remap_index 514
+#define UnlockArraysEXT_remap_index 515
+#define UseProgramStages_remap_index 516
+#define ValidateProgramPipeline_remap_index 517
+#define DebugMessageCallback_remap_index 518
+#define DebugMessageControl_remap_index 519
+#define DebugMessageInsert_remap_index 520
+#define GetDebugMessageLog_remap_index 521
+#define GetObjectLabel_remap_index 522
+#define GetObjectPtrLabel_remap_index 523
+#define ObjectLabel_remap_index 524
+#define ObjectPtrLabel_remap_index 525
+#define PopDebugGroup_remap_index 526
+#define PushDebugGroup_remap_index 527
+#define SecondaryColor3fEXT_remap_index 528
+#define SecondaryColor3fvEXT_remap_index 529
+#define MultiDrawElementsEXT_remap_index 530
+#define FogCoordfEXT_remap_index 531
+#define FogCoordfvEXT_remap_index 532
+#define ResizeBuffersMESA_remap_index 533
+#define WindowPos4dMESA_remap_index 534
+#define WindowPos4dvMESA_remap_index 535
+#define WindowPos4fMESA_remap_index 536
+#define WindowPos4fvMESA_remap_index 537
+#define WindowPos4iMESA_remap_index 538
+#define WindowPos4ivMESA_remap_index 539
+#define WindowPos4sMESA_remap_index 540
+#define WindowPos4svMESA_remap_index 541
+#define MultiModeDrawArraysIBM_remap_index 542
+#define MultiModeDrawElementsIBM_remap_index 543
+#define AreProgramsResidentNV_remap_index 544
+#define ExecuteProgramNV_remap_index 545
+#define GetProgramParameterdvNV_remap_index 546
+#define GetProgramParameterfvNV_remap_index 547
+#define GetProgramStringNV_remap_index 548
+#define GetProgramivNV_remap_index 549
+#define GetTrackMatrixivNV_remap_index 550
+#define GetVertexAttribdvNV_remap_index 551
+#define GetVertexAttribfvNV_remap_index 552
+#define GetVertexAttribivNV_remap_index 553
+#define LoadProgramNV_remap_index 554
+#define ProgramParameters4dvNV_remap_index 555
+#define ProgramParameters4fvNV_remap_index 556
+#define RequestResidentProgramsNV_remap_index 557
+#define TrackMatrixNV_remap_index 558
+#define VertexAttrib1dNV_remap_index 559
+#define VertexAttrib1dvNV_remap_index 560
+#define VertexAttrib1fNV_remap_index 561
+#define VertexAttrib1fvNV_remap_index 562
+#define VertexAttrib1sNV_remap_index 563
+#define VertexAttrib1svNV_remap_index 564
+#define VertexAttrib2dNV_remap_index 565
+#define VertexAttrib2dvNV_remap_index 566
+#define VertexAttrib2fNV_remap_index 567
+#define VertexAttrib2fvNV_remap_index 568
+#define VertexAttrib2sNV_remap_index 569
+#define VertexAttrib2svNV_remap_index 570
+#define VertexAttrib3dNV_remap_index 571
+#define VertexAttrib3dvNV_remap_index 572
+#define VertexAttrib3fNV_remap_index 573
+#define VertexAttrib3fvNV_remap_index 574
+#define VertexAttrib3sNV_remap_index 575
+#define VertexAttrib3svNV_remap_index 576
+#define VertexAttrib4dNV_remap_index 577
+#define VertexAttrib4dvNV_remap_index 578
+#define VertexAttrib4fNV_remap_index 579
+#define VertexAttrib4fvNV_remap_index 580
+#define VertexAttrib4sNV_remap_index 581
+#define VertexAttrib4svNV_remap_index 582
+#define VertexAttrib4ubNV_remap_index 583
+#define VertexAttrib4ubvNV_remap_index 584
+#define VertexAttribPointerNV_remap_index 585
+#define VertexAttribs1dvNV_remap_index 586
+#define VertexAttribs1fvNV_remap_index 587
+#define VertexAttribs1svNV_remap_index 588
+#define VertexAttribs2dvNV_remap_index 589
+#define VertexAttribs2fvNV_remap_index 590
+#define VertexAttribs2svNV_remap_index 591
+#define VertexAttribs3dvNV_remap_index 592
+#define VertexAttribs3fvNV_remap_index 593
+#define VertexAttribs3svNV_remap_index 594
+#define VertexAttribs4dvNV_remap_index 595
+#define VertexAttribs4fvNV_remap_index 596
+#define VertexAttribs4svNV_remap_index 597
+#define VertexAttribs4ubvNV_remap_index 598
+#define GetTexBumpParameterfvATI_remap_index 599
+#define GetTexBumpParameterivATI_remap_index 600
+#define TexBumpParameterfvATI_remap_index 601
+#define TexBumpParameterivATI_remap_index 602
+#define AlphaFragmentOp1ATI_remap_index 603
+#define AlphaFragmentOp2ATI_remap_index 604
+#define AlphaFragmentOp3ATI_remap_index 605
+#define BeginFragmentShaderATI_remap_index 606
+#define BindFragmentShaderATI_remap_index 607
+#define ColorFragmentOp1ATI_remap_index 608
+#define ColorFragmentOp2ATI_remap_index 609
+#define ColorFragmentOp3ATI_remap_index 610
+#define DeleteFragmentShaderATI_remap_index 611
+#define EndFragmentShaderATI_remap_index 612
+#define GenFragmentShadersATI_remap_index 613
+#define PassTexCoordATI_remap_index 614
+#define SampleMapATI_remap_index 615
+#define SetFragmentShaderConstantATI_remap_index 616
+#define ActiveStencilFaceEXT_remap_index 617
+#define BindVertexArrayAPPLE_remap_index 618
+#define GenVertexArraysAPPLE_remap_index 619
+#define GetProgramNamedParameterdvNV_remap_index 620
+#define GetProgramNamedParameterfvNV_remap_index 621
+#define ProgramNamedParameter4dNV_remap_index 622
+#define ProgramNamedParameter4dvNV_remap_index 623
+#define ProgramNamedParameter4fNV_remap_index 624
+#define ProgramNamedParameter4fvNV_remap_index 625
+#define PrimitiveRestartNV_remap_index 626
+#define GetTexGenxvOES_remap_index 627
+#define TexGenxOES_remap_index 628
+#define TexGenxvOES_remap_index 629
+#define DepthBoundsEXT_remap_index 630
+#define BindFramebufferEXT_remap_index 631
+#define BindRenderbufferEXT_remap_index 632
+#define BufferParameteriAPPLE_remap_index 633
+#define FlushMappedBufferRangeAPPLE_remap_index 634
+#define VertexAttribI1iEXT_remap_index 635
+#define VertexAttribI1uiEXT_remap_index 636
+#define VertexAttribI2iEXT_remap_index 637
+#define VertexAttribI2ivEXT_remap_index 638
+#define VertexAttribI2uiEXT_remap_index 639
+#define VertexAttribI2uivEXT_remap_index 640
+#define VertexAttribI3iEXT_remap_index 641
+#define VertexAttribI3ivEXT_remap_index 642
+#define VertexAttribI3uiEXT_remap_index 643
+#define VertexAttribI3uivEXT_remap_index 644
+#define VertexAttribI4iEXT_remap_index 645
+#define VertexAttribI4ivEXT_remap_index 646
+#define VertexAttribI4uiEXT_remap_index 647
+#define VertexAttribI4uivEXT_remap_index 648
+#define ClearColorIiEXT_remap_index 649
+#define ClearColorIuiEXT_remap_index 650
+#define BindBufferOffsetEXT_remap_index 651
+#define BeginPerfMonitorAMD_remap_index 652
+#define DeletePerfMonitorsAMD_remap_index 653
+#define EndPerfMonitorAMD_remap_index 654
+#define GenPerfMonitorsAMD_remap_index 655
+#define GetPerfMonitorCounterDataAMD_remap_index 656
+#define GetPerfMonitorCounterInfoAMD_remap_index 657
+#define GetPerfMonitorCounterStringAMD_remap_index 658
+#define GetPerfMonitorCountersAMD_remap_index 659
+#define GetPerfMonitorGroupStringAMD_remap_index 660
+#define GetPerfMonitorGroupsAMD_remap_index 661
+#define SelectPerfMonitorCountersAMD_remap_index 662
+#define GetObjectParameterivAPPLE_remap_index 663
+#define ObjectPurgeableAPPLE_remap_index 664
+#define ObjectUnpurgeableAPPLE_remap_index 665
+#define ActiveProgramEXT_remap_index 666
+#define CreateShaderProgramEXT_remap_index 667
+#define UseShaderProgramEXT_remap_index 668
+#define TextureBarrierNV_remap_index 669
+#define VDPAUFiniNV_remap_index 670
+#define VDPAUGetSurfaceivNV_remap_index 671
+#define VDPAUInitNV_remap_index 672
+#define VDPAUIsSurfaceNV_remap_index 673
+#define VDPAUMapSurfacesNV_remap_index 674
+#define VDPAURegisterOutputSurfaceNV_remap_index 675
+#define VDPAURegisterVideoSurfaceNV_remap_index 676
+#define VDPAUSurfaceAccessNV_remap_index 677
+#define VDPAUUnmapSurfacesNV_remap_index 678
+#define VDPAUUnregisterSurfaceNV_remap_index 679
+#define StencilFuncSeparateATI_remap_index 680
+#define ProgramEnvParameters4fvEXT_remap_index 681
+#define ProgramLocalParameters4fvEXT_remap_index 682
+#define EGLImageTargetRenderbufferStorageOES_remap_index 683
+#define EGLImageTargetTexture2DOES_remap_index 684
+#define AlphaFuncx_remap_index 685
+#define ClearColorx_remap_index 686
+#define ClearDepthx_remap_index 687
+#define Color4x_remap_index 688
+#define DepthRangex_remap_index 689
+#define Fogx_remap_index 690
+#define Fogxv_remap_index 691
+#define Frustumf_remap_index 692
+#define Frustumx_remap_index 693
+#define LightModelx_remap_index 694
+#define LightModelxv_remap_index 695
+#define Lightx_remap_index 696
+#define Lightxv_remap_index 697
+#define LineWidthx_remap_index 698
+#define LoadMatrixx_remap_index 699
+#define Materialx_remap_index 700
+#define Materialxv_remap_index 701
+#define MultMatrixx_remap_index 702
+#define MultiTexCoord4x_remap_index 703
+#define Normal3x_remap_index 704
+#define Orthof_remap_index 705
+#define Orthox_remap_index 706
+#define PointSizex_remap_index 707
+#define PolygonOffsetx_remap_index 708
+#define Rotatex_remap_index 709
+#define SampleCoveragex_remap_index 710
+#define Scalex_remap_index 711
+#define TexEnvx_remap_index 712
+#define TexEnvxv_remap_index 713
+#define TexParameterx_remap_index 714
+#define Translatex_remap_index 715
+#define ClipPlanef_remap_index 716
+#define ClipPlanex_remap_index 717
+#define GetClipPlanef_remap_index 718
+#define GetClipPlanex_remap_index 719
+#define GetFixedv_remap_index 720
+#define GetLightxv_remap_index 721
+#define GetMaterialxv_remap_index 722
+#define GetTexEnvxv_remap_index 723
+#define GetTexParameterxv_remap_index 724
+#define PointParameterx_remap_index 725
+#define PointParameterxv_remap_index 726
+#define TexParameterxv_remap_index 727
 
 #define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
 #define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1604,10 +1600,6 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_ViewportArrayv driDispatchRemapTable[ViewportArrayv_remap_index]
 #define _gloffset_ViewportIndexedf driDispatchRemapTable[ViewportIndexedf_remap_index]
 #define _gloffset_ViewportIndexedfv driDispatchRemapTable[ViewportIndexedfv_remap_index]
-#define _gloffset_DebugMessageCallbackARB driDispatchRemapTable[DebugMessageCallbackARB_remap_index]
-#define _gloffset_DebugMessageControlARB driDispatchRemapTable[DebugMessageControlARB_remap_index]
-#define _gloffset_DebugMessageInsertARB driDispatchRemapTable[DebugMessageInsertARB_remap_index]
-#define _gloffset_GetDebugMessageLogARB driDispatchRemapTable[GetDebugMessageLogARB_remap_index]
 #define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index]
 #define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index]
 #define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index]
@@ -10775,50 +10767,6 @@ static INLINE void SET_ViewportIndexedfv(struct _glapi_table *disp, void (GLAPIE
    SET_by_offset(disp, _gloffset_ViewportIndexedfv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, const GLvoid *);
-#define CALL_DebugMessageCallbackARB(disp, parameters) \
-    (* GET_DebugMessageCallbackARB(disp)) parameters
-static INLINE _glptr_DebugMessageCallbackARB GET_DebugMessageCallbackARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageCallbackARB) (GET_by_offset(disp, _gloffset_DebugMessageCallbackARB));
-}
-
-static INLINE void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, const GLvoid *)) {
-   SET_by_offset(disp, _gloffset_DebugMessageCallbackARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean);
-#define CALL_DebugMessageControlARB(disp, parameters) \
-    (* GET_DebugMessageControlARB(disp)) parameters
-static INLINE _glptr_DebugMessageControlARB GET_DebugMessageControlARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageControlARB) (GET_by_offset(disp, _gloffset_DebugMessageControlARB));
-}
-
-static INLINE void SET_DebugMessageControlARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)) {
-   SET_by_offset(disp, _gloffset_DebugMessageControlARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *);
-#define CALL_DebugMessageInsertARB(disp, parameters) \
-    (* GET_DebugMessageInsertARB(disp)) parameters
-static INLINE _glptr_DebugMessageInsertARB GET_DebugMessageInsertARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageInsertARB) (GET_by_offset(disp, _gloffset_DebugMessageInsertARB));
-}
-
-static INLINE void SET_DebugMessageInsertARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *)) {
-   SET_by_offset(disp, _gloffset_DebugMessageInsertARB, fn);
-}
-
-typedef GLuint (GLAPIENTRYP _glptr_GetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *);
-#define CALL_GetDebugMessageLogARB(disp, parameters) \
-    (* GET_GetDebugMessageLogARB(disp)) parameters
-static INLINE _glptr_GetDebugMessageLogARB GET_GetDebugMessageLogARB(struct _glapi_table *disp) {
-   return (_glptr_GetDebugMessageLogARB) (GET_by_offset(disp, _gloffset_GetDebugMessageLogARB));
-}
-
-static INLINE void SET_GetDebugMessageLogARB(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *)) {
-   SET_by_offset(disp, _gloffset_GetDebugMessageLogARB, fn);
-}
-
 typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void);
 #define CALL_GetGraphicsResetStatusARB(disp, parameters) \
     (* GET_GetGraphicsResetStatusARB(disp)) parameters