fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012

9 files changed, 3025 insertions, 3069 deletions

diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index e5b05b7b5..03c5992b9 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 979
+#define _gloffset_COUNT 978
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -504,553 +504,552 @@
 #define _gloffset_ClearBufferiv 433
 #define _gloffset_ClearBufferuiv 434
 #define _gloffset_GetStringi 435
-#define _gloffset_TexBuffer 436
-#define _gloffset_FramebufferTexture 437
-#define _gloffset_GetBufferParameteri64v 438
-#define _gloffset_GetInteger64i_v 439
-#define _gloffset_VertexAttribDivisor 440
-#define _gloffset_LoadTransposeMatrixdARB 441
-#define _gloffset_LoadTransposeMatrixfARB 442
-#define _gloffset_MultTransposeMatrixdARB 443
-#define _gloffset_MultTransposeMatrixfARB 444
-#define _gloffset_SampleCoverageARB 445
-#define _gloffset_CompressedTexImage1DARB 446
-#define _gloffset_CompressedTexImage2DARB 447
-#define _gloffset_CompressedTexImage3DARB 448
-#define _gloffset_CompressedTexSubImage1DARB 449
-#define _gloffset_CompressedTexSubImage2DARB 450
-#define _gloffset_CompressedTexSubImage3DARB 451
-#define _gloffset_GetCompressedTexImageARB 452
-#define _gloffset_DisableVertexAttribArrayARB 453
-#define _gloffset_EnableVertexAttribArrayARB 454
-#define _gloffset_GetProgramEnvParameterdvARB 455
-#define _gloffset_GetProgramEnvParameterfvARB 456
-#define _gloffset_GetProgramLocalParameterdvARB 457
-#define _gloffset_GetProgramLocalParameterfvARB 458
-#define _gloffset_GetProgramStringARB 459
-#define _gloffset_GetProgramivARB 460
-#define _gloffset_GetVertexAttribdvARB 461
-#define _gloffset_GetVertexAttribfvARB 462
-#define _gloffset_GetVertexAttribivARB 463
-#define _gloffset_ProgramEnvParameter4dARB 464
-#define _gloffset_ProgramEnvParameter4dvARB 465
-#define _gloffset_ProgramEnvParameter4fARB 466
-#define _gloffset_ProgramEnvParameter4fvARB 467
-#define _gloffset_ProgramLocalParameter4dARB 468
-#define _gloffset_ProgramLocalParameter4dvARB 469
-#define _gloffset_ProgramLocalParameter4fARB 470
-#define _gloffset_ProgramLocalParameter4fvARB 471
-#define _gloffset_ProgramStringARB 472
-#define _gloffset_VertexAttrib1dARB 473
-#define _gloffset_VertexAttrib1dvARB 474
-#define _gloffset_VertexAttrib1fARB 475
-#define _gloffset_VertexAttrib1fvARB 476
-#define _gloffset_VertexAttrib1sARB 477
-#define _gloffset_VertexAttrib1svARB 478
-#define _gloffset_VertexAttrib2dARB 479
-#define _gloffset_VertexAttrib2dvARB 480
-#define _gloffset_VertexAttrib2fARB 481
-#define _gloffset_VertexAttrib2fvARB 482
-#define _gloffset_VertexAttrib2sARB 483
-#define _gloffset_VertexAttrib2svARB 484
-#define _gloffset_VertexAttrib3dARB 485
-#define _gloffset_VertexAttrib3dvARB 486
-#define _gloffset_VertexAttrib3fARB 487
-#define _gloffset_VertexAttrib3fvARB 488
-#define _gloffset_VertexAttrib3sARB 489
-#define _gloffset_VertexAttrib3svARB 490
-#define _gloffset_VertexAttrib4NbvARB 491
-#define _gloffset_VertexAttrib4NivARB 492
-#define _gloffset_VertexAttrib4NsvARB 493
-#define _gloffset_VertexAttrib4NubARB 494
-#define _gloffset_VertexAttrib4NubvARB 495
-#define _gloffset_VertexAttrib4NuivARB 496
-#define _gloffset_VertexAttrib4NusvARB 497
-#define _gloffset_VertexAttrib4bvARB 498
-#define _gloffset_VertexAttrib4dARB 499
-#define _gloffset_VertexAttrib4dvARB 500
-#define _gloffset_VertexAttrib4fARB 501
-#define _gloffset_VertexAttrib4fvARB 502
-#define _gloffset_VertexAttrib4ivARB 503
-#define _gloffset_VertexAttrib4sARB 504
-#define _gloffset_VertexAttrib4svARB 505
-#define _gloffset_VertexAttrib4ubvARB 506
-#define _gloffset_VertexAttrib4uivARB 507
-#define _gloffset_VertexAttrib4usvARB 508
-#define _gloffset_VertexAttribPointerARB 509
-#define _gloffset_BindBufferARB 510
-#define _gloffset_BufferDataARB 511
-#define _gloffset_BufferSubDataARB 512
-#define _gloffset_DeleteBuffersARB 513
-#define _gloffset_GenBuffersARB 514
-#define _gloffset_GetBufferParameterivARB 515
-#define _gloffset_GetBufferPointervARB 516
-#define _gloffset_GetBufferSubDataARB 517
-#define _gloffset_IsBufferARB 518
-#define _gloffset_MapBufferARB 519
-#define _gloffset_UnmapBufferARB 520
-#define _gloffset_BeginQueryARB 521
-#define _gloffset_DeleteQueriesARB 522
-#define _gloffset_EndQueryARB 523
-#define _gloffset_GenQueriesARB 524
-#define _gloffset_GetQueryObjectivARB 525
-#define _gloffset_GetQueryObjectuivARB 526
-#define _gloffset_GetQueryivARB 527
-#define _gloffset_IsQueryARB 528
-#define _gloffset_AttachObjectARB 529
-#define _gloffset_CompileShaderARB 530
-#define _gloffset_CreateProgramObjectARB 531
-#define _gloffset_CreateShaderObjectARB 532
-#define _gloffset_DeleteObjectARB 533
-#define _gloffset_DetachObjectARB 534
-#define _gloffset_GetActiveUniformARB 535
-#define _gloffset_GetAttachedObjectsARB 536
-#define _gloffset_GetHandleARB 537
-#define _gloffset_GetInfoLogARB 538
-#define _gloffset_GetObjectParameterfvARB 539
-#define _gloffset_GetObjectParameterivARB 540
-#define _gloffset_GetShaderSourceARB 541
-#define _gloffset_GetUniformLocationARB 542
-#define _gloffset_GetUniformfvARB 543
-#define _gloffset_GetUniformivARB 544
-#define _gloffset_LinkProgramARB 545
-#define _gloffset_ShaderSourceARB 546
-#define _gloffset_Uniform1fARB 547
-#define _gloffset_Uniform1fvARB 548
-#define _gloffset_Uniform1iARB 549
-#define _gloffset_Uniform1ivARB 550
-#define _gloffset_Uniform2fARB 551
-#define _gloffset_Uniform2fvARB 552
-#define _gloffset_Uniform2iARB 553
-#define _gloffset_Uniform2ivARB 554
-#define _gloffset_Uniform3fARB 555
-#define _gloffset_Uniform3fvARB 556
-#define _gloffset_Uniform3iARB 557
-#define _gloffset_Uniform3ivARB 558
-#define _gloffset_Uniform4fARB 559
-#define _gloffset_Uniform4fvARB 560
-#define _gloffset_Uniform4iARB 561
-#define _gloffset_Uniform4ivARB 562
-#define _gloffset_UniformMatrix2fvARB 563
-#define _gloffset_UniformMatrix3fvARB 564
-#define _gloffset_UniformMatrix4fvARB 565
-#define _gloffset_UseProgramObjectARB 566
-#define _gloffset_ValidateProgramARB 567
-#define _gloffset_BindAttribLocationARB 568
-#define _gloffset_GetActiveAttribARB 569
-#define _gloffset_GetAttribLocationARB 570
-#define _gloffset_DrawBuffersARB 571
-#define _gloffset_ClampColorARB 572
-#define _gloffset_DrawArraysInstancedARB 573
-#define _gloffset_DrawElementsInstancedARB 574
-#define _gloffset_RenderbufferStorageMultisample 575
-#define _gloffset_FramebufferTextureARB 576
-#define _gloffset_FramebufferTextureFaceARB 577
-#define _gloffset_ProgramParameteriARB 578
-#define _gloffset_VertexAttribDivisorARB 579
-#define _gloffset_FlushMappedBufferRange 580
-#define _gloffset_MapBufferRange 581
-#define _gloffset_TexBufferARB 582
-#define _gloffset_BindVertexArray 583
-#define _gloffset_GenVertexArrays 584
-#define _gloffset_CopyBufferSubData 585
-#define _gloffset_ClientWaitSync 586
-#define _gloffset_DeleteSync 587
-#define _gloffset_FenceSync 588
-#define _gloffset_GetInteger64v 589
-#define _gloffset_GetSynciv 590
-#define _gloffset_IsSync 591
-#define _gloffset_WaitSync 592
-#define _gloffset_DrawElementsBaseVertex 593
-#define _gloffset_DrawElementsInstancedBaseVertex 594
-#define _gloffset_DrawRangeElementsBaseVertex 595
-#define _gloffset_MultiDrawElementsBaseVertex 596
-#define _gloffset_BlendEquationSeparateiARB 597
-#define _gloffset_BlendEquationiARB 598
-#define _gloffset_BlendFuncSeparateiARB 599
-#define _gloffset_BlendFunciARB 600
-#define _gloffset_BindFragDataLocationIndexed 601
-#define _gloffset_GetFragDataIndex 602
-#define _gloffset_BindSampler 603
-#define _gloffset_DeleteSamplers 604
-#define _gloffset_GenSamplers 605
-#define _gloffset_GetSamplerParameterIiv 606
-#define _gloffset_GetSamplerParameterIuiv 607
-#define _gloffset_GetSamplerParameterfv 608
-#define _gloffset_GetSamplerParameteriv 609
-#define _gloffset_IsSampler 610
-#define _gloffset_SamplerParameterIiv 611
-#define _gloffset_SamplerParameterIuiv 612
-#define _gloffset_SamplerParameterf 613
-#define _gloffset_SamplerParameterfv 614
-#define _gloffset_SamplerParameteri 615
-#define _gloffset_SamplerParameteriv 616
-#define _gloffset_ColorP3ui 617
-#define _gloffset_ColorP3uiv 618
-#define _gloffset_ColorP4ui 619
-#define _gloffset_ColorP4uiv 620
-#define _gloffset_MultiTexCoordP1ui 621
-#define _gloffset_MultiTexCoordP1uiv 622
-#define _gloffset_MultiTexCoordP2ui 623
-#define _gloffset_MultiTexCoordP2uiv 624
-#define _gloffset_MultiTexCoordP3ui 625
-#define _gloffset_MultiTexCoordP3uiv 626
-#define _gloffset_MultiTexCoordP4ui 627
-#define _gloffset_MultiTexCoordP4uiv 628
-#define _gloffset_NormalP3ui 629
-#define _gloffset_NormalP3uiv 630
-#define _gloffset_SecondaryColorP3ui 631
-#define _gloffset_SecondaryColorP3uiv 632
-#define _gloffset_TexCoordP1ui 633
-#define _gloffset_TexCoordP1uiv 634
-#define _gloffset_TexCoordP2ui 635
-#define _gloffset_TexCoordP2uiv 636
-#define _gloffset_TexCoordP3ui 637
-#define _gloffset_TexCoordP3uiv 638
-#define _gloffset_TexCoordP4ui 639
-#define _gloffset_TexCoordP4uiv 640
-#define _gloffset_VertexAttribP1ui 641
-#define _gloffset_VertexAttribP1uiv 642
-#define _gloffset_VertexAttribP2ui 643
-#define _gloffset_VertexAttribP2uiv 644
-#define _gloffset_VertexAttribP3ui 645
-#define _gloffset_VertexAttribP3uiv 646
-#define _gloffset_VertexAttribP4ui 647
-#define _gloffset_VertexAttribP4uiv 648
-#define _gloffset_VertexP2ui 649
-#define _gloffset_VertexP2uiv 650
-#define _gloffset_VertexP3ui 651
-#define _gloffset_VertexP3uiv 652
-#define _gloffset_VertexP4ui 653
-#define _gloffset_VertexP4uiv 654
-#define _gloffset_BindTransformFeedback 655
-#define _gloffset_DeleteTransformFeedbacks 656
-#define _gloffset_DrawTransformFeedback 657
-#define _gloffset_GenTransformFeedbacks 658
-#define _gloffset_IsTransformFeedback 659
-#define _gloffset_PauseTransformFeedback 660
-#define _gloffset_ResumeTransformFeedback 661
-#define _gloffset_ClearDepthf 662
-#define _gloffset_DepthRangef 663
-#define _gloffset_GetShaderPrecisionFormat 664
-#define _gloffset_ReleaseShaderCompiler 665
-#define _gloffset_ShaderBinary 666
-#define _gloffset_DebugMessageCallbackARB 667
-#define _gloffset_DebugMessageControlARB 668
-#define _gloffset_DebugMessageInsertARB 669
-#define _gloffset_GetDebugMessageLogARB 670
-#define _gloffset_GetGraphicsResetStatusARB 671
-#define _gloffset_GetnColorTableARB 672
-#define _gloffset_GetnCompressedTexImageARB 673
-#define _gloffset_GetnConvolutionFilterARB 674
-#define _gloffset_GetnHistogramARB 675
-#define _gloffset_GetnMapdvARB 676
-#define _gloffset_GetnMapfvARB 677
-#define _gloffset_GetnMapivARB 678
-#define _gloffset_GetnMinmaxARB 679
-#define _gloffset_GetnPixelMapfvARB 680
-#define _gloffset_GetnPixelMapuivARB 681
-#define _gloffset_GetnPixelMapusvARB 682
-#define _gloffset_GetnPolygonStippleARB 683
-#define _gloffset_GetnSeparableFilterARB 684
-#define _gloffset_GetnTexImageARB 685
-#define _gloffset_GetnUniformdvARB 686
-#define _gloffset_GetnUniformfvARB 687
-#define _gloffset_GetnUniformivARB 688
-#define _gloffset_GetnUniformuivARB 689
-#define _gloffset_ReadnPixelsARB 690
-#define _gloffset_TexStorage1D 691
-#define _gloffset_TexStorage2D 692
-#define _gloffset_TexStorage3D 693
-#define _gloffset_TextureStorage1DEXT 694
-#define _gloffset_TextureStorage2DEXT 695
-#define _gloffset_TextureStorage3DEXT 696
-#define _gloffset_PolygonOffsetEXT 697
-#define _gloffset_GetPixelTexGenParameterfvSGIS 698
-#define _gloffset_GetPixelTexGenParameterivSGIS 699
-#define _gloffset_PixelTexGenParameterfSGIS 700
-#define _gloffset_PixelTexGenParameterfvSGIS 701
-#define _gloffset_PixelTexGenParameteriSGIS 702
-#define _gloffset_PixelTexGenParameterivSGIS 703
-#define _gloffset_SampleMaskSGIS 704
-#define _gloffset_SamplePatternSGIS 705
-#define _gloffset_ColorPointerEXT 706
-#define _gloffset_EdgeFlagPointerEXT 707
-#define _gloffset_IndexPointerEXT 708
-#define _gloffset_NormalPointerEXT 709
-#define _gloffset_TexCoordPointerEXT 710
-#define _gloffset_VertexPointerEXT 711
-#define _gloffset_PointParameterfEXT 712
-#define _gloffset_PointParameterfvEXT 713
-#define _gloffset_LockArraysEXT 714
-#define _gloffset_UnlockArraysEXT 715
-#define _gloffset_SecondaryColor3bEXT 716
-#define _gloffset_SecondaryColor3bvEXT 717
-#define _gloffset_SecondaryColor3dEXT 718
-#define _gloffset_SecondaryColor3dvEXT 719
-#define _gloffset_SecondaryColor3fEXT 720
-#define _gloffset_SecondaryColor3fvEXT 721
-#define _gloffset_SecondaryColor3iEXT 722
-#define _gloffset_SecondaryColor3ivEXT 723
-#define _gloffset_SecondaryColor3sEXT 724
-#define _gloffset_SecondaryColor3svEXT 725
-#define _gloffset_SecondaryColor3ubEXT 726
-#define _gloffset_SecondaryColor3ubvEXT 727
-#define _gloffset_SecondaryColor3uiEXT 728
-#define _gloffset_SecondaryColor3uivEXT 729
-#define _gloffset_SecondaryColor3usEXT 730
-#define _gloffset_SecondaryColor3usvEXT 731
-#define _gloffset_SecondaryColorPointerEXT 732
-#define _gloffset_MultiDrawArraysEXT 733
-#define _gloffset_MultiDrawElementsEXT 734
-#define _gloffset_FogCoordPointerEXT 735
-#define _gloffset_FogCoorddEXT 736
-#define _gloffset_FogCoorddvEXT 737
-#define _gloffset_FogCoordfEXT 738
-#define _gloffset_FogCoordfvEXT 739
-#define _gloffset_PixelTexGenSGIX 740
-#define _gloffset_BlendFuncSeparateEXT 741
-#define _gloffset_FlushVertexArrayRangeNV 742
-#define _gloffset_VertexArrayRangeNV 743
-#define _gloffset_CombinerInputNV 744
-#define _gloffset_CombinerOutputNV 745
-#define _gloffset_CombinerParameterfNV 746
-#define _gloffset_CombinerParameterfvNV 747
-#define _gloffset_CombinerParameteriNV 748
-#define _gloffset_CombinerParameterivNV 749
-#define _gloffset_FinalCombinerInputNV 750
-#define _gloffset_GetCombinerInputParameterfvNV 751
-#define _gloffset_GetCombinerInputParameterivNV 752
-#define _gloffset_GetCombinerOutputParameterfvNV 753
-#define _gloffset_GetCombinerOutputParameterivNV 754
-#define _gloffset_GetFinalCombinerInputParameterfvNV 755
-#define _gloffset_GetFinalCombinerInputParameterivNV 756
-#define _gloffset_ResizeBuffersMESA 757
-#define _gloffset_WindowPos2dMESA 758
-#define _gloffset_WindowPos2dvMESA 759
-#define _gloffset_WindowPos2fMESA 760
-#define _gloffset_WindowPos2fvMESA 761
-#define _gloffset_WindowPos2iMESA 762
-#define _gloffset_WindowPos2ivMESA 763
-#define _gloffset_WindowPos2sMESA 764
-#define _gloffset_WindowPos2svMESA 765
-#define _gloffset_WindowPos3dMESA 766
-#define _gloffset_WindowPos3dvMESA 767
-#define _gloffset_WindowPos3fMESA 768
-#define _gloffset_WindowPos3fvMESA 769
-#define _gloffset_WindowPos3iMESA 770
-#define _gloffset_WindowPos3ivMESA 771
-#define _gloffset_WindowPos3sMESA 772
-#define _gloffset_WindowPos3svMESA 773
-#define _gloffset_WindowPos4dMESA 774
-#define _gloffset_WindowPos4dvMESA 775
-#define _gloffset_WindowPos4fMESA 776
-#define _gloffset_WindowPos4fvMESA 777
-#define _gloffset_WindowPos4iMESA 778
-#define _gloffset_WindowPos4ivMESA 779
-#define _gloffset_WindowPos4sMESA 780
-#define _gloffset_WindowPos4svMESA 781
-#define _gloffset_MultiModeDrawArraysIBM 782
-#define _gloffset_MultiModeDrawElementsIBM 783
-#define _gloffset_DeleteFencesNV 784
-#define _gloffset_FinishFenceNV 785
-#define _gloffset_GenFencesNV 786
-#define _gloffset_GetFenceivNV 787
-#define _gloffset_IsFenceNV 788
-#define _gloffset_SetFenceNV 789
-#define _gloffset_TestFenceNV 790
-#define _gloffset_AreProgramsResidentNV 791
-#define _gloffset_BindProgramNV 792
-#define _gloffset_DeleteProgramsNV 793
-#define _gloffset_ExecuteProgramNV 794
-#define _gloffset_GenProgramsNV 795
-#define _gloffset_GetProgramParameterdvNV 796
-#define _gloffset_GetProgramParameterfvNV 797
-#define _gloffset_GetProgramStringNV 798
-#define _gloffset_GetProgramivNV 799
-#define _gloffset_GetTrackMatrixivNV 800
-#define _gloffset_GetVertexAttribPointervNV 801
-#define _gloffset_GetVertexAttribdvNV 802
-#define _gloffset_GetVertexAttribfvNV 803
-#define _gloffset_GetVertexAttribivNV 804
-#define _gloffset_IsProgramNV 805
-#define _gloffset_LoadProgramNV 806
-#define _gloffset_ProgramParameters4dvNV 807
-#define _gloffset_ProgramParameters4fvNV 808
-#define _gloffset_RequestResidentProgramsNV 809
-#define _gloffset_TrackMatrixNV 810
-#define _gloffset_VertexAttrib1dNV 811
-#define _gloffset_VertexAttrib1dvNV 812
-#define _gloffset_VertexAttrib1fNV 813
-#define _gloffset_VertexAttrib1fvNV 814
-#define _gloffset_VertexAttrib1sNV 815
-#define _gloffset_VertexAttrib1svNV 816
-#define _gloffset_VertexAttrib2dNV 817
-#define _gloffset_VertexAttrib2dvNV 818
-#define _gloffset_VertexAttrib2fNV 819
-#define _gloffset_VertexAttrib2fvNV 820
-#define _gloffset_VertexAttrib2sNV 821
-#define _gloffset_VertexAttrib2svNV 822
-#define _gloffset_VertexAttrib3dNV 823
-#define _gloffset_VertexAttrib3dvNV 824
-#define _gloffset_VertexAttrib3fNV 825
-#define _gloffset_VertexAttrib3fvNV 826
-#define _gloffset_VertexAttrib3sNV 827
-#define _gloffset_VertexAttrib3svNV 828
-#define _gloffset_VertexAttrib4dNV 829
-#define _gloffset_VertexAttrib4dvNV 830
-#define _gloffset_VertexAttrib4fNV 831
-#define _gloffset_VertexAttrib4fvNV 832
-#define _gloffset_VertexAttrib4sNV 833
-#define _gloffset_VertexAttrib4svNV 834
-#define _gloffset_VertexAttrib4ubNV 835
-#define _gloffset_VertexAttrib4ubvNV 836
-#define _gloffset_VertexAttribPointerNV 837
-#define _gloffset_VertexAttribs1dvNV 838
-#define _gloffset_VertexAttribs1fvNV 839
-#define _gloffset_VertexAttribs1svNV 840
-#define _gloffset_VertexAttribs2dvNV 841
-#define _gloffset_VertexAttribs2fvNV 842
-#define _gloffset_VertexAttribs2svNV 843
-#define _gloffset_VertexAttribs3dvNV 844
-#define _gloffset_VertexAttribs3fvNV 845
-#define _gloffset_VertexAttribs3svNV 846
-#define _gloffset_VertexAttribs4dvNV 847
-#define _gloffset_VertexAttribs4fvNV 848
-#define _gloffset_VertexAttribs4svNV 849
-#define _gloffset_VertexAttribs4ubvNV 850
-#define _gloffset_GetTexBumpParameterfvATI 851
-#define _gloffset_GetTexBumpParameterivATI 852
-#define _gloffset_TexBumpParameterfvATI 853
-#define _gloffset_TexBumpParameterivATI 854
-#define _gloffset_AlphaFragmentOp1ATI 855
-#define _gloffset_AlphaFragmentOp2ATI 856
-#define _gloffset_AlphaFragmentOp3ATI 857
-#define _gloffset_BeginFragmentShaderATI 858
-#define _gloffset_BindFragmentShaderATI 859
-#define _gloffset_ColorFragmentOp1ATI 860
-#define _gloffset_ColorFragmentOp2ATI 861
-#define _gloffset_ColorFragmentOp3ATI 862
-#define _gloffset_DeleteFragmentShaderATI 863
-#define _gloffset_EndFragmentShaderATI 864
-#define _gloffset_GenFragmentShadersATI 865
-#define _gloffset_PassTexCoordATI 866
-#define _gloffset_SampleMapATI 867
-#define _gloffset_SetFragmentShaderConstantATI 868
-#define _gloffset_PointParameteriNV 869
-#define _gloffset_PointParameterivNV 870
-#define _gloffset_ActiveStencilFaceEXT 871
-#define _gloffset_BindVertexArrayAPPLE 872
-#define _gloffset_DeleteVertexArraysAPPLE 873
-#define _gloffset_GenVertexArraysAPPLE 874
-#define _gloffset_IsVertexArrayAPPLE 875
-#define _gloffset_GetProgramNamedParameterdvNV 876
-#define _gloffset_GetProgramNamedParameterfvNV 877
-#define _gloffset_ProgramNamedParameter4dNV 878
-#define _gloffset_ProgramNamedParameter4dvNV 879
-#define _gloffset_ProgramNamedParameter4fNV 880
-#define _gloffset_ProgramNamedParameter4fvNV 881
-#define _gloffset_PrimitiveRestartIndexNV 882
-#define _gloffset_PrimitiveRestartNV 883
-#define _gloffset_DepthBoundsEXT 884
-#define _gloffset_BlendEquationSeparateEXT 885
-#define _gloffset_BindFramebufferEXT 886
-#define _gloffset_BindRenderbufferEXT 887
-#define _gloffset_CheckFramebufferStatusEXT 888
-#define _gloffset_DeleteFramebuffersEXT 889
-#define _gloffset_DeleteRenderbuffersEXT 890
-#define _gloffset_FramebufferRenderbufferEXT 891
-#define _gloffset_FramebufferTexture1DEXT 892
-#define _gloffset_FramebufferTexture2DEXT 893
-#define _gloffset_FramebufferTexture3DEXT 894
-#define _gloffset_GenFramebuffersEXT 895
-#define _gloffset_GenRenderbuffersEXT 896
-#define _gloffset_GenerateMipmapEXT 897
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 898
-#define _gloffset_GetRenderbufferParameterivEXT 899
-#define _gloffset_IsFramebufferEXT 900
-#define _gloffset_IsRenderbufferEXT 901
-#define _gloffset_RenderbufferStorageEXT 902
-#define _gloffset_BlitFramebufferEXT 903
-#define _gloffset_BufferParameteriAPPLE 904
-#define _gloffset_FlushMappedBufferRangeAPPLE 905
-#define _gloffset_BindFragDataLocationEXT 906
-#define _gloffset_GetFragDataLocationEXT 907
-#define _gloffset_GetUniformuivEXT 908
-#define _gloffset_GetVertexAttribIivEXT 909
-#define _gloffset_GetVertexAttribIuivEXT 910
-#define _gloffset_Uniform1uiEXT 911
-#define _gloffset_Uniform1uivEXT 912
-#define _gloffset_Uniform2uiEXT 913
-#define _gloffset_Uniform2uivEXT 914
-#define _gloffset_Uniform3uiEXT 915
-#define _gloffset_Uniform3uivEXT 916
-#define _gloffset_Uniform4uiEXT 917
-#define _gloffset_Uniform4uivEXT 918
-#define _gloffset_VertexAttribI1iEXT 919
-#define _gloffset_VertexAttribI1ivEXT 920
-#define _gloffset_VertexAttribI1uiEXT 921
-#define _gloffset_VertexAttribI1uivEXT 922
-#define _gloffset_VertexAttribI2iEXT 923
-#define _gloffset_VertexAttribI2ivEXT 924
-#define _gloffset_VertexAttribI2uiEXT 925
-#define _gloffset_VertexAttribI2uivEXT 926
-#define _gloffset_VertexAttribI3iEXT 927
-#define _gloffset_VertexAttribI3ivEXT 928
-#define _gloffset_VertexAttribI3uiEXT 929
-#define _gloffset_VertexAttribI3uivEXT 930
-#define _gloffset_VertexAttribI4bvEXT 931
-#define _gloffset_VertexAttribI4iEXT 932
-#define _gloffset_VertexAttribI4ivEXT 933
-#define _gloffset_VertexAttribI4svEXT 934
-#define _gloffset_VertexAttribI4ubvEXT 935
-#define _gloffset_VertexAttribI4uiEXT 936
-#define _gloffset_VertexAttribI4uivEXT 937
-#define _gloffset_VertexAttribI4usvEXT 938
-#define _gloffset_VertexAttribIPointerEXT 939
-#define _gloffset_FramebufferTextureLayerEXT 940
-#define _gloffset_ColorMaskIndexedEXT 941
-#define _gloffset_DisableIndexedEXT 942
-#define _gloffset_EnableIndexedEXT 943
-#define _gloffset_GetBooleanIndexedvEXT 944
-#define _gloffset_GetIntegerIndexedvEXT 945
-#define _gloffset_IsEnabledIndexedEXT 946
-#define _gloffset_ClearColorIiEXT 947
-#define _gloffset_ClearColorIuiEXT 948
-#define _gloffset_GetTexParameterIivEXT 949
-#define _gloffset_GetTexParameterIuivEXT 950
-#define _gloffset_TexParameterIivEXT 951
-#define _gloffset_TexParameterIuivEXT 952
-#define _gloffset_BeginConditionalRenderNV 953
-#define _gloffset_EndConditionalRenderNV 954
-#define _gloffset_BeginTransformFeedbackEXT 955
-#define _gloffset_BindBufferBaseEXT 956
-#define _gloffset_BindBufferOffsetEXT 957
-#define _gloffset_BindBufferRangeEXT 958
-#define _gloffset_EndTransformFeedbackEXT 959
-#define _gloffset_GetTransformFeedbackVaryingEXT 960
-#define _gloffset_TransformFeedbackVaryingsEXT 961
-#define _gloffset_ProvokingVertexEXT 962
-#define _gloffset_GetTexParameterPointervAPPLE 963
-#define _gloffset_TextureRangeAPPLE 964
-#define _gloffset_GetObjectParameterivAPPLE 965
-#define _gloffset_ObjectPurgeableAPPLE 966
-#define _gloffset_ObjectUnpurgeableAPPLE 967
-#define _gloffset_ActiveProgramEXT 968
-#define _gloffset_CreateShaderProgramEXT 969
-#define _gloffset_UseShaderProgramEXT 970
-#define _gloffset_TextureBarrierNV 971
-#define _gloffset_StencilFuncSeparateATI 972
-#define _gloffset_ProgramEnvParameters4fvEXT 973
-#define _gloffset_ProgramLocalParameters4fvEXT 974
-#define _gloffset_GetQueryObjecti64vEXT 975
-#define _gloffset_GetQueryObjectui64vEXT 976
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 977
-#define _gloffset_EGLImageTargetTexture2DOES 978
+#define _gloffset_FramebufferTexture 436
+#define _gloffset_GetBufferParameteri64v 437
+#define _gloffset_GetInteger64i_v 438
+#define _gloffset_VertexAttribDivisor 439
+#define _gloffset_LoadTransposeMatrixdARB 440
+#define _gloffset_LoadTransposeMatrixfARB 441
+#define _gloffset_MultTransposeMatrixdARB 442
+#define _gloffset_MultTransposeMatrixfARB 443
+#define _gloffset_SampleCoverageARB 444
+#define _gloffset_CompressedTexImage1DARB 445
+#define _gloffset_CompressedTexImage2DARB 446
+#define _gloffset_CompressedTexImage3DARB 447
+#define _gloffset_CompressedTexSubImage1DARB 448
+#define _gloffset_CompressedTexSubImage2DARB 449
+#define _gloffset_CompressedTexSubImage3DARB 450
+#define _gloffset_GetCompressedTexImageARB 451
+#define _gloffset_DisableVertexAttribArrayARB 452
+#define _gloffset_EnableVertexAttribArrayARB 453
+#define _gloffset_GetProgramEnvParameterdvARB 454
+#define _gloffset_GetProgramEnvParameterfvARB 455
+#define _gloffset_GetProgramLocalParameterdvARB 456
+#define _gloffset_GetProgramLocalParameterfvARB 457
+#define _gloffset_GetProgramStringARB 458
+#define _gloffset_GetProgramivARB 459
+#define _gloffset_GetVertexAttribdvARB 460
+#define _gloffset_GetVertexAttribfvARB 461
+#define _gloffset_GetVertexAttribivARB 462
+#define _gloffset_ProgramEnvParameter4dARB 463
+#define _gloffset_ProgramEnvParameter4dvARB 464
+#define _gloffset_ProgramEnvParameter4fARB 465
+#define _gloffset_ProgramEnvParameter4fvARB 466
+#define _gloffset_ProgramLocalParameter4dARB 467
+#define _gloffset_ProgramLocalParameter4dvARB 468
+#define _gloffset_ProgramLocalParameter4fARB 469
+#define _gloffset_ProgramLocalParameter4fvARB 470
+#define _gloffset_ProgramStringARB 471
+#define _gloffset_VertexAttrib1dARB 472
+#define _gloffset_VertexAttrib1dvARB 473
+#define _gloffset_VertexAttrib1fARB 474
+#define _gloffset_VertexAttrib1fvARB 475
+#define _gloffset_VertexAttrib1sARB 476
+#define _gloffset_VertexAttrib1svARB 477
+#define _gloffset_VertexAttrib2dARB 478
+#define _gloffset_VertexAttrib2dvARB 479
+#define _gloffset_VertexAttrib2fARB 480
+#define _gloffset_VertexAttrib2fvARB 481
+#define _gloffset_VertexAttrib2sARB 482
+#define _gloffset_VertexAttrib2svARB 483
+#define _gloffset_VertexAttrib3dARB 484
+#define _gloffset_VertexAttrib3dvARB 485
+#define _gloffset_VertexAttrib3fARB 486
+#define _gloffset_VertexAttrib3fvARB 487
+#define _gloffset_VertexAttrib3sARB 488
+#define _gloffset_VertexAttrib3svARB 489
+#define _gloffset_VertexAttrib4NbvARB 490
+#define _gloffset_VertexAttrib4NivARB 491
+#define _gloffset_VertexAttrib4NsvARB 492
+#define _gloffset_VertexAttrib4NubARB 493
+#define _gloffset_VertexAttrib4NubvARB 494
+#define _gloffset_VertexAttrib4NuivARB 495
+#define _gloffset_VertexAttrib4NusvARB 496
+#define _gloffset_VertexAttrib4bvARB 497
+#define _gloffset_VertexAttrib4dARB 498
+#define _gloffset_VertexAttrib4dvARB 499
+#define _gloffset_VertexAttrib4fARB 500
+#define _gloffset_VertexAttrib4fvARB 501
+#define _gloffset_VertexAttrib4ivARB 502
+#define _gloffset_VertexAttrib4sARB 503
+#define _gloffset_VertexAttrib4svARB 504
+#define _gloffset_VertexAttrib4ubvARB 505
+#define _gloffset_VertexAttrib4uivARB 506
+#define _gloffset_VertexAttrib4usvARB 507
+#define _gloffset_VertexAttribPointerARB 508
+#define _gloffset_BindBufferARB 509
+#define _gloffset_BufferDataARB 510
+#define _gloffset_BufferSubDataARB 511
+#define _gloffset_DeleteBuffersARB 512
+#define _gloffset_GenBuffersARB 513
+#define _gloffset_GetBufferParameterivARB 514
+#define _gloffset_GetBufferPointervARB 515
+#define _gloffset_GetBufferSubDataARB 516
+#define _gloffset_IsBufferARB 517
+#define _gloffset_MapBufferARB 518
+#define _gloffset_UnmapBufferARB 519
+#define _gloffset_BeginQueryARB 520
+#define _gloffset_DeleteQueriesARB 521
+#define _gloffset_EndQueryARB 522
+#define _gloffset_GenQueriesARB 523
+#define _gloffset_GetQueryObjectivARB 524
+#define _gloffset_GetQueryObjectuivARB 525
+#define _gloffset_GetQueryivARB 526
+#define _gloffset_IsQueryARB 527
+#define _gloffset_AttachObjectARB 528
+#define _gloffset_CompileShaderARB 529
+#define _gloffset_CreateProgramObjectARB 530
+#define _gloffset_CreateShaderObjectARB 531
+#define _gloffset_DeleteObjectARB 532
+#define _gloffset_DetachObjectARB 533
+#define _gloffset_GetActiveUniformARB 534
+#define _gloffset_GetAttachedObjectsARB 535
+#define _gloffset_GetHandleARB 536
+#define _gloffset_GetInfoLogARB 537
+#define _gloffset_GetObjectParameterfvARB 538
+#define _gloffset_GetObjectParameterivARB 539
+#define _gloffset_GetShaderSourceARB 540
+#define _gloffset_GetUniformLocationARB 541
+#define _gloffset_GetUniformfvARB 542
+#define _gloffset_GetUniformivARB 543
+#define _gloffset_LinkProgramARB 544
+#define _gloffset_ShaderSourceARB 545
+#define _gloffset_Uniform1fARB 546
+#define _gloffset_Uniform1fvARB 547
+#define _gloffset_Uniform1iARB 548
+#define _gloffset_Uniform1ivARB 549
+#define _gloffset_Uniform2fARB 550
+#define _gloffset_Uniform2fvARB 551
+#define _gloffset_Uniform2iARB 552
+#define _gloffset_Uniform2ivARB 553
+#define _gloffset_Uniform3fARB 554
+#define _gloffset_Uniform3fvARB 555
+#define _gloffset_Uniform3iARB 556
+#define _gloffset_Uniform3ivARB 557
+#define _gloffset_Uniform4fARB 558
+#define _gloffset_Uniform4fvARB 559
+#define _gloffset_Uniform4iARB 560
+#define _gloffset_Uniform4ivARB 561
+#define _gloffset_UniformMatrix2fvARB 562
+#define _gloffset_UniformMatrix3fvARB 563
+#define _gloffset_UniformMatrix4fvARB 564
+#define _gloffset_UseProgramObjectARB 565
+#define _gloffset_ValidateProgramARB 566
+#define _gloffset_BindAttribLocationARB 567
+#define _gloffset_GetActiveAttribARB 568
+#define _gloffset_GetAttribLocationARB 569
+#define _gloffset_DrawBuffersARB 570
+#define _gloffset_ClampColorARB 571
+#define _gloffset_DrawArraysInstancedARB 572
+#define _gloffset_DrawElementsInstancedARB 573
+#define _gloffset_RenderbufferStorageMultisample 574
+#define _gloffset_FramebufferTextureARB 575
+#define _gloffset_FramebufferTextureFaceARB 576
+#define _gloffset_ProgramParameteriARB 577
+#define _gloffset_VertexAttribDivisorARB 578
+#define _gloffset_FlushMappedBufferRange 579
+#define _gloffset_MapBufferRange 580
+#define _gloffset_TexBufferARB 581
+#define _gloffset_BindVertexArray 582
+#define _gloffset_GenVertexArrays 583
+#define _gloffset_CopyBufferSubData 584
+#define _gloffset_ClientWaitSync 585
+#define _gloffset_DeleteSync 586
+#define _gloffset_FenceSync 587
+#define _gloffset_GetInteger64v 588
+#define _gloffset_GetSynciv 589
+#define _gloffset_IsSync 590
+#define _gloffset_WaitSync 591
+#define _gloffset_DrawElementsBaseVertex 592
+#define _gloffset_DrawElementsInstancedBaseVertex 593
+#define _gloffset_DrawRangeElementsBaseVertex 594
+#define _gloffset_MultiDrawElementsBaseVertex 595
+#define _gloffset_BlendEquationSeparateiARB 596
+#define _gloffset_BlendEquationiARB 597
+#define _gloffset_BlendFuncSeparateiARB 598
+#define _gloffset_BlendFunciARB 599
+#define _gloffset_BindFragDataLocationIndexed 600
+#define _gloffset_GetFragDataIndex 601
+#define _gloffset_BindSampler 602
+#define _gloffset_DeleteSamplers 603
+#define _gloffset_GenSamplers 604
+#define _gloffset_GetSamplerParameterIiv 605
+#define _gloffset_GetSamplerParameterIuiv 606
+#define _gloffset_GetSamplerParameterfv 607
+#define _gloffset_GetSamplerParameteriv 608
+#define _gloffset_IsSampler 609
+#define _gloffset_SamplerParameterIiv 610
+#define _gloffset_SamplerParameterIuiv 611
+#define _gloffset_SamplerParameterf 612
+#define _gloffset_SamplerParameterfv 613
+#define _gloffset_SamplerParameteri 614
+#define _gloffset_SamplerParameteriv 615
+#define _gloffset_ColorP3ui 616
+#define _gloffset_ColorP3uiv 617
+#define _gloffset_ColorP4ui 618
+#define _gloffset_ColorP4uiv 619
+#define _gloffset_MultiTexCoordP1ui 620
+#define _gloffset_MultiTexCoordP1uiv 621
+#define _gloffset_MultiTexCoordP2ui 622
+#define _gloffset_MultiTexCoordP2uiv 623
+#define _gloffset_MultiTexCoordP3ui 624
+#define _gloffset_MultiTexCoordP3uiv 625
+#define _gloffset_MultiTexCoordP4ui 626
+#define _gloffset_MultiTexCoordP4uiv 627
+#define _gloffset_NormalP3ui 628
+#define _gloffset_NormalP3uiv 629
+#define _gloffset_SecondaryColorP3ui 630
+#define _gloffset_SecondaryColorP3uiv 631
+#define _gloffset_TexCoordP1ui 632
+#define _gloffset_TexCoordP1uiv 633
+#define _gloffset_TexCoordP2ui 634
+#define _gloffset_TexCoordP2uiv 635
+#define _gloffset_TexCoordP3ui 636
+#define _gloffset_TexCoordP3uiv 637
+#define _gloffset_TexCoordP4ui 638
+#define _gloffset_TexCoordP4uiv 639
+#define _gloffset_VertexAttribP1ui 640
+#define _gloffset_VertexAttribP1uiv 641
+#define _gloffset_VertexAttribP2ui 642
+#define _gloffset_VertexAttribP2uiv 643
+#define _gloffset_VertexAttribP3ui 644
+#define _gloffset_VertexAttribP3uiv 645
+#define _gloffset_VertexAttribP4ui 646
+#define _gloffset_VertexAttribP4uiv 647
+#define _gloffset_VertexP2ui 648
+#define _gloffset_VertexP2uiv 649
+#define _gloffset_VertexP3ui 650
+#define _gloffset_VertexP3uiv 651
+#define _gloffset_VertexP4ui 652
+#define _gloffset_VertexP4uiv 653
+#define _gloffset_BindTransformFeedback 654
+#define _gloffset_DeleteTransformFeedbacks 655
+#define _gloffset_DrawTransformFeedback 656
+#define _gloffset_GenTransformFeedbacks 657
+#define _gloffset_IsTransformFeedback 658
+#define _gloffset_PauseTransformFeedback 659
+#define _gloffset_ResumeTransformFeedback 660
+#define _gloffset_ClearDepthf 661
+#define _gloffset_DepthRangef 662
+#define _gloffset_GetShaderPrecisionFormat 663
+#define _gloffset_ReleaseShaderCompiler 664
+#define _gloffset_ShaderBinary 665
+#define _gloffset_DebugMessageCallbackARB 666
+#define _gloffset_DebugMessageControlARB 667
+#define _gloffset_DebugMessageInsertARB 668
+#define _gloffset_GetDebugMessageLogARB 669
+#define _gloffset_GetGraphicsResetStatusARB 670
+#define _gloffset_GetnColorTableARB 671
+#define _gloffset_GetnCompressedTexImageARB 672
+#define _gloffset_GetnConvolutionFilterARB 673
+#define _gloffset_GetnHistogramARB 674
+#define _gloffset_GetnMapdvARB 675
+#define _gloffset_GetnMapfvARB 676
+#define _gloffset_GetnMapivARB 677
+#define _gloffset_GetnMinmaxARB 678
+#define _gloffset_GetnPixelMapfvARB 679
+#define _gloffset_GetnPixelMapuivARB 680
+#define _gloffset_GetnPixelMapusvARB 681
+#define _gloffset_GetnPolygonStippleARB 682
+#define _gloffset_GetnSeparableFilterARB 683
+#define _gloffset_GetnTexImageARB 684
+#define _gloffset_GetnUniformdvARB 685
+#define _gloffset_GetnUniformfvARB 686
+#define _gloffset_GetnUniformivARB 687
+#define _gloffset_GetnUniformuivARB 688
+#define _gloffset_ReadnPixelsARB 689
+#define _gloffset_TexStorage1D 690
+#define _gloffset_TexStorage2D 691
+#define _gloffset_TexStorage3D 692
+#define _gloffset_TextureStorage1DEXT 693
+#define _gloffset_TextureStorage2DEXT 694
+#define _gloffset_TextureStorage3DEXT 695
+#define _gloffset_PolygonOffsetEXT 696
+#define _gloffset_GetPixelTexGenParameterfvSGIS 697
+#define _gloffset_GetPixelTexGenParameterivSGIS 698
+#define _gloffset_PixelTexGenParameterfSGIS 699
+#define _gloffset_PixelTexGenParameterfvSGIS 700
+#define _gloffset_PixelTexGenParameteriSGIS 701
+#define _gloffset_PixelTexGenParameterivSGIS 702
+#define _gloffset_SampleMaskSGIS 703
+#define _gloffset_SamplePatternSGIS 704
+#define _gloffset_ColorPointerEXT 705
+#define _gloffset_EdgeFlagPointerEXT 706
+#define _gloffset_IndexPointerEXT 707
+#define _gloffset_NormalPointerEXT 708
+#define _gloffset_TexCoordPointerEXT 709
+#define _gloffset_VertexPointerEXT 710
+#define _gloffset_PointParameterfEXT 711
+#define _gloffset_PointParameterfvEXT 712
+#define _gloffset_LockArraysEXT 713
+#define _gloffset_UnlockArraysEXT 714
+#define _gloffset_SecondaryColor3bEXT 715
+#define _gloffset_SecondaryColor3bvEXT 716
+#define _gloffset_SecondaryColor3dEXT 717
+#define _gloffset_SecondaryColor3dvEXT 718
+#define _gloffset_SecondaryColor3fEXT 719
+#define _gloffset_SecondaryColor3fvEXT 720
+#define _gloffset_SecondaryColor3iEXT 721
+#define _gloffset_SecondaryColor3ivEXT 722
+#define _gloffset_SecondaryColor3sEXT 723
+#define _gloffset_SecondaryColor3svEXT 724
+#define _gloffset_SecondaryColor3ubEXT 725
+#define _gloffset_SecondaryColor3ubvEXT 726
+#define _gloffset_SecondaryColor3uiEXT 727
+#define _gloffset_SecondaryColor3uivEXT 728
+#define _gloffset_SecondaryColor3usEXT 729
+#define _gloffset_SecondaryColor3usvEXT 730
+#define _gloffset_SecondaryColorPointerEXT 731
+#define _gloffset_MultiDrawArraysEXT 732
+#define _gloffset_MultiDrawElementsEXT 733
+#define _gloffset_FogCoordPointerEXT 734
+#define _gloffset_FogCoorddEXT 735
+#define _gloffset_FogCoorddvEXT 736
+#define _gloffset_FogCoordfEXT 737
+#define _gloffset_FogCoordfvEXT 738
+#define _gloffset_PixelTexGenSGIX 739
+#define _gloffset_BlendFuncSeparateEXT 740
+#define _gloffset_FlushVertexArrayRangeNV 741
+#define _gloffset_VertexArrayRangeNV 742
+#define _gloffset_CombinerInputNV 743
+#define _gloffset_CombinerOutputNV 744
+#define _gloffset_CombinerParameterfNV 745
+#define _gloffset_CombinerParameterfvNV 746
+#define _gloffset_CombinerParameteriNV 747
+#define _gloffset_CombinerParameterivNV 748
+#define _gloffset_FinalCombinerInputNV 749
+#define _gloffset_GetCombinerInputParameterfvNV 750
+#define _gloffset_GetCombinerInputParameterivNV 751
+#define _gloffset_GetCombinerOutputParameterfvNV 752
+#define _gloffset_GetCombinerOutputParameterivNV 753
+#define _gloffset_GetFinalCombinerInputParameterfvNV 754
+#define _gloffset_GetFinalCombinerInputParameterivNV 755
+#define _gloffset_ResizeBuffersMESA 756
+#define _gloffset_WindowPos2dMESA 757
+#define _gloffset_WindowPos2dvMESA 758
+#define _gloffset_WindowPos2fMESA 759
+#define _gloffset_WindowPos2fvMESA 760
+#define _gloffset_WindowPos2iMESA 761
+#define _gloffset_WindowPos2ivMESA 762
+#define _gloffset_WindowPos2sMESA 763
+#define _gloffset_WindowPos2svMESA 764
+#define _gloffset_WindowPos3dMESA 765
+#define _gloffset_WindowPos3dvMESA 766
+#define _gloffset_WindowPos3fMESA 767
+#define _gloffset_WindowPos3fvMESA 768
+#define _gloffset_WindowPos3iMESA 769
+#define _gloffset_WindowPos3ivMESA 770
+#define _gloffset_WindowPos3sMESA 771
+#define _gloffset_WindowPos3svMESA 772
+#define _gloffset_WindowPos4dMESA 773
+#define _gloffset_WindowPos4dvMESA 774
+#define _gloffset_WindowPos4fMESA 775
+#define _gloffset_WindowPos4fvMESA 776
+#define _gloffset_WindowPos4iMESA 777
+#define _gloffset_WindowPos4ivMESA 778
+#define _gloffset_WindowPos4sMESA 779
+#define _gloffset_WindowPos4svMESA 780
+#define _gloffset_MultiModeDrawArraysIBM 781
+#define _gloffset_MultiModeDrawElementsIBM 782
+#define _gloffset_DeleteFencesNV 783
+#define _gloffset_FinishFenceNV 784
+#define _gloffset_GenFencesNV 785
+#define _gloffset_GetFenceivNV 786
+#define _gloffset_IsFenceNV 787
+#define _gloffset_SetFenceNV 788
+#define _gloffset_TestFenceNV 789
+#define _gloffset_AreProgramsResidentNV 790
+#define _gloffset_BindProgramNV 791
+#define _gloffset_DeleteProgramsNV 792
+#define _gloffset_ExecuteProgramNV 793
+#define _gloffset_GenProgramsNV 794
+#define _gloffset_GetProgramParameterdvNV 795
+#define _gloffset_GetProgramParameterfvNV 796
+#define _gloffset_GetProgramStringNV 797
+#define _gloffset_GetProgramivNV 798
+#define _gloffset_GetTrackMatrixivNV 799
+#define _gloffset_GetVertexAttribPointervNV 800
+#define _gloffset_GetVertexAttribdvNV 801
+#define _gloffset_GetVertexAttribfvNV 802
+#define _gloffset_GetVertexAttribivNV 803
+#define _gloffset_IsProgramNV 804
+#define _gloffset_LoadProgramNV 805
+#define _gloffset_ProgramParameters4dvNV 806
+#define _gloffset_ProgramParameters4fvNV 807
+#define _gloffset_RequestResidentProgramsNV 808
+#define _gloffset_TrackMatrixNV 809
+#define _gloffset_VertexAttrib1dNV 810
+#define _gloffset_VertexAttrib1dvNV 811
+#define _gloffset_VertexAttrib1fNV 812
+#define _gloffset_VertexAttrib1fvNV 813
+#define _gloffset_VertexAttrib1sNV 814
+#define _gloffset_VertexAttrib1svNV 815
+#define _gloffset_VertexAttrib2dNV 816
+#define _gloffset_VertexAttrib2dvNV 817
+#define _gloffset_VertexAttrib2fNV 818
+#define _gloffset_VertexAttrib2fvNV 819
+#define _gloffset_VertexAttrib2sNV 820
+#define _gloffset_VertexAttrib2svNV 821
+#define _gloffset_VertexAttrib3dNV 822
+#define _gloffset_VertexAttrib3dvNV 823
+#define _gloffset_VertexAttrib3fNV 824
+#define _gloffset_VertexAttrib3fvNV 825
+#define _gloffset_VertexAttrib3sNV 826
+#define _gloffset_VertexAttrib3svNV 827
+#define _gloffset_VertexAttrib4dNV 828
+#define _gloffset_VertexAttrib4dvNV 829
+#define _gloffset_VertexAttrib4fNV 830
+#define _gloffset_VertexAttrib4fvNV 831
+#define _gloffset_VertexAttrib4sNV 832
+#define _gloffset_VertexAttrib4svNV 833
+#define _gloffset_VertexAttrib4ubNV 834
+#define _gloffset_VertexAttrib4ubvNV 835
+#define _gloffset_VertexAttribPointerNV 836
+#define _gloffset_VertexAttribs1dvNV 837
+#define _gloffset_VertexAttribs1fvNV 838
+#define _gloffset_VertexAttribs1svNV 839
+#define _gloffset_VertexAttribs2dvNV 840
+#define _gloffset_VertexAttribs2fvNV 841
+#define _gloffset_VertexAttribs2svNV 842
+#define _gloffset_VertexAttribs3dvNV 843
+#define _gloffset_VertexAttribs3fvNV 844
+#define _gloffset_VertexAttribs3svNV 845
+#define _gloffset_VertexAttribs4dvNV 846
+#define _gloffset_VertexAttribs4fvNV 847
+#define _gloffset_VertexAttribs4svNV 848
+#define _gloffset_VertexAttribs4ubvNV 849
+#define _gloffset_GetTexBumpParameterfvATI 850
+#define _gloffset_GetTexBumpParameterivATI 851
+#define _gloffset_TexBumpParameterfvATI 852
+#define _gloffset_TexBumpParameterivATI 853
+#define _gloffset_AlphaFragmentOp1ATI 854
+#define _gloffset_AlphaFragmentOp2ATI 855
+#define _gloffset_AlphaFragmentOp3ATI 856
+#define _gloffset_BeginFragmentShaderATI 857
+#define _gloffset_BindFragmentShaderATI 858
+#define _gloffset_ColorFragmentOp1ATI 859
+#define _gloffset_ColorFragmentOp2ATI 860
+#define _gloffset_ColorFragmentOp3ATI 861
+#define _gloffset_DeleteFragmentShaderATI 862
+#define _gloffset_EndFragmentShaderATI 863
+#define _gloffset_GenFragmentShadersATI 864
+#define _gloffset_PassTexCoordATI 865
+#define _gloffset_SampleMapATI 866
+#define _gloffset_SetFragmentShaderConstantATI 867
+#define _gloffset_PointParameteriNV 868
+#define _gloffset_PointParameterivNV 869
+#define _gloffset_ActiveStencilFaceEXT 870
+#define _gloffset_BindVertexArrayAPPLE 871
+#define _gloffset_DeleteVertexArraysAPPLE 872
+#define _gloffset_GenVertexArraysAPPLE 873
+#define _gloffset_IsVertexArrayAPPLE 874
+#define _gloffset_GetProgramNamedParameterdvNV 875
+#define _gloffset_GetProgramNamedParameterfvNV 876
+#define _gloffset_ProgramNamedParameter4dNV 877
+#define _gloffset_ProgramNamedParameter4dvNV 878
+#define _gloffset_ProgramNamedParameter4fNV 879
+#define _gloffset_ProgramNamedParameter4fvNV 880
+#define _gloffset_PrimitiveRestartIndexNV 881
+#define _gloffset_PrimitiveRestartNV 882
+#define _gloffset_DepthBoundsEXT 883
+#define _gloffset_BlendEquationSeparateEXT 884
+#define _gloffset_BindFramebufferEXT 885
+#define _gloffset_BindRenderbufferEXT 886
+#define _gloffset_CheckFramebufferStatusEXT 887
+#define _gloffset_DeleteFramebuffersEXT 888
+#define _gloffset_DeleteRenderbuffersEXT 889
+#define _gloffset_FramebufferRenderbufferEXT 890
+#define _gloffset_FramebufferTexture1DEXT 891
+#define _gloffset_FramebufferTexture2DEXT 892
+#define _gloffset_FramebufferTexture3DEXT 893
+#define _gloffset_GenFramebuffersEXT 894
+#define _gloffset_GenRenderbuffersEXT 895
+#define _gloffset_GenerateMipmapEXT 896
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 897
+#define _gloffset_GetRenderbufferParameterivEXT 898
+#define _gloffset_IsFramebufferEXT 899
+#define _gloffset_IsRenderbufferEXT 900
+#define _gloffset_RenderbufferStorageEXT 901
+#define _gloffset_BlitFramebufferEXT 902
+#define _gloffset_BufferParameteriAPPLE 903
+#define _gloffset_FlushMappedBufferRangeAPPLE 904
+#define _gloffset_BindFragDataLocationEXT 905
+#define _gloffset_GetFragDataLocationEXT 906
+#define _gloffset_GetUniformuivEXT 907
+#define _gloffset_GetVertexAttribIivEXT 908
+#define _gloffset_GetVertexAttribIuivEXT 909
+#define _gloffset_Uniform1uiEXT 910
+#define _gloffset_Uniform1uivEXT 911
+#define _gloffset_Uniform2uiEXT 912
+#define _gloffset_Uniform2uivEXT 913
+#define _gloffset_Uniform3uiEXT 914
+#define _gloffset_Uniform3uivEXT 915
+#define _gloffset_Uniform4uiEXT 916
+#define _gloffset_Uniform4uivEXT 917
+#define _gloffset_VertexAttribI1iEXT 918
+#define _gloffset_VertexAttribI1ivEXT 919
+#define _gloffset_VertexAttribI1uiEXT 920
+#define _gloffset_VertexAttribI1uivEXT 921
+#define _gloffset_VertexAttribI2iEXT 922
+#define _gloffset_VertexAttribI2ivEXT 923
+#define _gloffset_VertexAttribI2uiEXT 924
+#define _gloffset_VertexAttribI2uivEXT 925
+#define _gloffset_VertexAttribI3iEXT 926
+#define _gloffset_VertexAttribI3ivEXT 927
+#define _gloffset_VertexAttribI3uiEXT 928
+#define _gloffset_VertexAttribI3uivEXT 929
+#define _gloffset_VertexAttribI4bvEXT 930
+#define _gloffset_VertexAttribI4iEXT 931
+#define _gloffset_VertexAttribI4ivEXT 932
+#define _gloffset_VertexAttribI4svEXT 933
+#define _gloffset_VertexAttribI4ubvEXT 934
+#define _gloffset_VertexAttribI4uiEXT 935
+#define _gloffset_VertexAttribI4uivEXT 936
+#define _gloffset_VertexAttribI4usvEXT 937
+#define _gloffset_VertexAttribIPointerEXT 938
+#define _gloffset_FramebufferTextureLayerEXT 939
+#define _gloffset_ColorMaskIndexedEXT 940
+#define _gloffset_DisableIndexedEXT 941
+#define _gloffset_EnableIndexedEXT 942
+#define _gloffset_GetBooleanIndexedvEXT 943
+#define _gloffset_GetIntegerIndexedvEXT 944
+#define _gloffset_IsEnabledIndexedEXT 945
+#define _gloffset_ClearColorIiEXT 946
+#define _gloffset_ClearColorIuiEXT 947
+#define _gloffset_GetTexParameterIivEXT 948
+#define _gloffset_GetTexParameterIuivEXT 949
+#define _gloffset_TexParameterIivEXT 950
+#define _gloffset_TexParameterIuivEXT 951
+#define _gloffset_BeginConditionalRenderNV 952
+#define _gloffset_EndConditionalRenderNV 953
+#define _gloffset_BeginTransformFeedbackEXT 954
+#define _gloffset_BindBufferBaseEXT 955
+#define _gloffset_BindBufferOffsetEXT 956
+#define _gloffset_BindBufferRangeEXT 957
+#define _gloffset_EndTransformFeedbackEXT 958
+#define _gloffset_GetTransformFeedbackVaryingEXT 959
+#define _gloffset_TransformFeedbackVaryingsEXT 960
+#define _gloffset_ProvokingVertexEXT 961
+#define _gloffset_GetTexParameterPointervAPPLE 962
+#define _gloffset_TextureRangeAPPLE 963
+#define _gloffset_GetObjectParameterivAPPLE 964
+#define _gloffset_ObjectPurgeableAPPLE 965
+#define _gloffset_ObjectUnpurgeableAPPLE 966
+#define _gloffset_ActiveProgramEXT 967
+#define _gloffset_CreateShaderProgramEXT 968
+#define _gloffset_UseShaderProgramEXT 969
+#define _gloffset_TextureBarrierNV 970
+#define _gloffset_StencilFuncSeparateATI 971
+#define _gloffset_ProgramEnvParameters4fvEXT 972
+#define _gloffset_ProgramLocalParameters4fvEXT 973
+#define _gloffset_GetQueryObjecti64vEXT 974
+#define _gloffset_GetQueryObjectui64vEXT 975
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 976
+#define _gloffset_EGLImageTargetTexture2DOES 977
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 571
+#define driDispatchRemapTable_size 570
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1081,549 +1080,548 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ClearBufferiv_remap_index 25
 #define ClearBufferuiv_remap_index 26
 #define GetStringi_remap_index 27
-#define TexBuffer_remap_index 28
-#define FramebufferTexture_remap_index 29
-#define GetBufferParameteri64v_remap_index 30
-#define GetInteger64i_v_remap_index 31
-#define VertexAttribDivisor_remap_index 32
-#define LoadTransposeMatrixdARB_remap_index 33
-#define LoadTransposeMatrixfARB_remap_index 34
-#define MultTransposeMatrixdARB_remap_index 35
-#define MultTransposeMatrixfARB_remap_index 36
-#define SampleCoverageARB_remap_index 37
-#define CompressedTexImage1DARB_remap_index 38
-#define CompressedTexImage2DARB_remap_index 39
-#define CompressedTexImage3DARB_remap_index 40
-#define CompressedTexSubImage1DARB_remap_index 41
-#define CompressedTexSubImage2DARB_remap_index 42
-#define CompressedTexSubImage3DARB_remap_index 43
-#define GetCompressedTexImageARB_remap_index 44
-#define DisableVertexAttribArrayARB_remap_index 45
-#define EnableVertexAttribArrayARB_remap_index 46
-#define GetProgramEnvParameterdvARB_remap_index 47
-#define GetProgramEnvParameterfvARB_remap_index 48
-#define GetProgramLocalParameterdvARB_remap_index 49
-#define GetProgramLocalParameterfvARB_remap_index 50
-#define GetProgramStringARB_remap_index 51
-#define GetProgramivARB_remap_index 52
-#define GetVertexAttribdvARB_remap_index 53
-#define GetVertexAttribfvARB_remap_index 54
-#define GetVertexAttribivARB_remap_index 55
-#define ProgramEnvParameter4dARB_remap_index 56
-#define ProgramEnvParameter4dvARB_remap_index 57
-#define ProgramEnvParameter4fARB_remap_index 58
-#define ProgramEnvParameter4fvARB_remap_index 59
-#define ProgramLocalParameter4dARB_remap_index 60
-#define ProgramLocalParameter4dvARB_remap_index 61
-#define ProgramLocalParameter4fARB_remap_index 62
-#define ProgramLocalParameter4fvARB_remap_index 63
-#define ProgramStringARB_remap_index 64
-#define VertexAttrib1dARB_remap_index 65
-#define VertexAttrib1dvARB_remap_index 66
-#define VertexAttrib1fARB_remap_index 67
-#define VertexAttrib1fvARB_remap_index 68
-#define VertexAttrib1sARB_remap_index 69
-#define VertexAttrib1svARB_remap_index 70
-#define VertexAttrib2dARB_remap_index 71
-#define VertexAttrib2dvARB_remap_index 72
-#define VertexAttrib2fARB_remap_index 73
-#define VertexAttrib2fvARB_remap_index 74
-#define VertexAttrib2sARB_remap_index 75
-#define VertexAttrib2svARB_remap_index 76
-#define VertexAttrib3dARB_remap_index 77
-#define VertexAttrib3dvARB_remap_index 78
-#define VertexAttrib3fARB_remap_index 79
-#define VertexAttrib3fvARB_remap_index 80
-#define VertexAttrib3sARB_remap_index 81
-#define VertexAttrib3svARB_remap_index 82
-#define VertexAttrib4NbvARB_remap_index 83
-#define VertexAttrib4NivARB_remap_index 84
-#define VertexAttrib4NsvARB_remap_index 85
-#define VertexAttrib4NubARB_remap_index 86
-#define VertexAttrib4NubvARB_remap_index 87
-#define VertexAttrib4NuivARB_remap_index 88
-#define VertexAttrib4NusvARB_remap_index 89
-#define VertexAttrib4bvARB_remap_index 90
-#define VertexAttrib4dARB_remap_index 91
-#define VertexAttrib4dvARB_remap_index 92
-#define VertexAttrib4fARB_remap_index 93
-#define VertexAttrib4fvARB_remap_index 94
-#define VertexAttrib4ivARB_remap_index 95
-#define VertexAttrib4sARB_remap_index 96
-#define VertexAttrib4svARB_remap_index 97
-#define VertexAttrib4ubvARB_remap_index 98
-#define VertexAttrib4uivARB_remap_index 99
-#define VertexAttrib4usvARB_remap_index 100
-#define VertexAttribPointerARB_remap_index 101
-#define BindBufferARB_remap_index 102
-#define BufferDataARB_remap_index 103
-#define BufferSubDataARB_remap_index 104
-#define DeleteBuffersARB_remap_index 105
-#define GenBuffersARB_remap_index 106
-#define GetBufferParameterivARB_remap_index 107
-#define GetBufferPointervARB_remap_index 108
-#define GetBufferSubDataARB_remap_index 109
-#define IsBufferARB_remap_index 110
-#define MapBufferARB_remap_index 111
-#define UnmapBufferARB_remap_index 112
-#define BeginQueryARB_remap_index 113
-#define DeleteQueriesARB_remap_index 114
-#define EndQueryARB_remap_index 115
-#define GenQueriesARB_remap_index 116
-#define GetQueryObjectivARB_remap_index 117
-#define GetQueryObjectuivARB_remap_index 118
-#define GetQueryivARB_remap_index 119
-#define IsQueryARB_remap_index 120
-#define AttachObjectARB_remap_index 121
-#define CompileShaderARB_remap_index 122
-#define CreateProgramObjectARB_remap_index 123
-#define CreateShaderObjectARB_remap_index 124
-#define DeleteObjectARB_remap_index 125
-#define DetachObjectARB_remap_index 126
-#define GetActiveUniformARB_remap_index 127
-#define GetAttachedObjectsARB_remap_index 128
-#define GetHandleARB_remap_index 129
-#define GetInfoLogARB_remap_index 130
-#define GetObjectParameterfvARB_remap_index 131
-#define GetObjectParameterivARB_remap_index 132
-#define GetShaderSourceARB_remap_index 133
-#define GetUniformLocationARB_remap_index 134
-#define GetUniformfvARB_remap_index 135
-#define GetUniformivARB_remap_index 136
-#define LinkProgramARB_remap_index 137
-#define ShaderSourceARB_remap_index 138
-#define Uniform1fARB_remap_index 139
-#define Uniform1fvARB_remap_index 140
-#define Uniform1iARB_remap_index 141
-#define Uniform1ivARB_remap_index 142
-#define Uniform2fARB_remap_index 143
-#define Uniform2fvARB_remap_index 144
-#define Uniform2iARB_remap_index 145
-#define Uniform2ivARB_remap_index 146
-#define Uniform3fARB_remap_index 147
-#define Uniform3fvARB_remap_index 148
-#define Uniform3iARB_remap_index 149
-#define Uniform3ivARB_remap_index 150
-#define Uniform4fARB_remap_index 151
-#define Uniform4fvARB_remap_index 152
-#define Uniform4iARB_remap_index 153
-#define Uniform4ivARB_remap_index 154
-#define UniformMatrix2fvARB_remap_index 155
-#define UniformMatrix3fvARB_remap_index 156
-#define UniformMatrix4fvARB_remap_index 157
-#define UseProgramObjectARB_remap_index 158
-#define ValidateProgramARB_remap_index 159
-#define BindAttribLocationARB_remap_index 160
-#define GetActiveAttribARB_remap_index 161
-#define GetAttribLocationARB_remap_index 162
-#define DrawBuffersARB_remap_index 163
-#define ClampColorARB_remap_index 164
-#define DrawArraysInstancedARB_remap_index 165
-#define DrawElementsInstancedARB_remap_index 166
-#define RenderbufferStorageMultisample_remap_index 167
-#define FramebufferTextureARB_remap_index 168
-#define FramebufferTextureFaceARB_remap_index 169
-#define ProgramParameteriARB_remap_index 170
-#define VertexAttribDivisorARB_remap_index 171
-#define FlushMappedBufferRange_remap_index 172
-#define MapBufferRange_remap_index 173
-#define TexBufferARB_remap_index 174
-#define BindVertexArray_remap_index 175
-#define GenVertexArrays_remap_index 176
-#define CopyBufferSubData_remap_index 177
-#define ClientWaitSync_remap_index 178
-#define DeleteSync_remap_index 179
-#define FenceSync_remap_index 180
-#define GetInteger64v_remap_index 181
-#define GetSynciv_remap_index 182
-#define IsSync_remap_index 183
-#define WaitSync_remap_index 184
-#define DrawElementsBaseVertex_remap_index 185
-#define DrawElementsInstancedBaseVertex_remap_index 186
-#define DrawRangeElementsBaseVertex_remap_index 187
-#define MultiDrawElementsBaseVertex_remap_index 188
-#define BlendEquationSeparateiARB_remap_index 189
-#define BlendEquationiARB_remap_index 190
-#define BlendFuncSeparateiARB_remap_index 191
-#define BlendFunciARB_remap_index 192
-#define BindFragDataLocationIndexed_remap_index 193
-#define GetFragDataIndex_remap_index 194
-#define BindSampler_remap_index 195
-#define DeleteSamplers_remap_index 196
-#define GenSamplers_remap_index 197
-#define GetSamplerParameterIiv_remap_index 198
-#define GetSamplerParameterIuiv_remap_index 199
-#define GetSamplerParameterfv_remap_index 200
-#define GetSamplerParameteriv_remap_index 201
-#define IsSampler_remap_index 202
-#define SamplerParameterIiv_remap_index 203
-#define SamplerParameterIuiv_remap_index 204
-#define SamplerParameterf_remap_index 205
-#define SamplerParameterfv_remap_index 206
-#define SamplerParameteri_remap_index 207
-#define SamplerParameteriv_remap_index 208
-#define ColorP3ui_remap_index 209
-#define ColorP3uiv_remap_index 210
-#define ColorP4ui_remap_index 211
-#define ColorP4uiv_remap_index 212
-#define MultiTexCoordP1ui_remap_index 213
-#define MultiTexCoordP1uiv_remap_index 214
-#define MultiTexCoordP2ui_remap_index 215
-#define MultiTexCoordP2uiv_remap_index 216
-#define MultiTexCoordP3ui_remap_index 217
-#define MultiTexCoordP3uiv_remap_index 218
-#define MultiTexCoordP4ui_remap_index 219
-#define MultiTexCoordP4uiv_remap_index 220
-#define NormalP3ui_remap_index 221
-#define NormalP3uiv_remap_index 222
-#define SecondaryColorP3ui_remap_index 223
-#define SecondaryColorP3uiv_remap_index 224
-#define TexCoordP1ui_remap_index 225
-#define TexCoordP1uiv_remap_index 226
-#define TexCoordP2ui_remap_index 227
-#define TexCoordP2uiv_remap_index 228
-#define TexCoordP3ui_remap_index 229
-#define TexCoordP3uiv_remap_index 230
-#define TexCoordP4ui_remap_index 231
-#define TexCoordP4uiv_remap_index 232
-#define VertexAttribP1ui_remap_index 233
-#define VertexAttribP1uiv_remap_index 234
-#define VertexAttribP2ui_remap_index 235
-#define VertexAttribP2uiv_remap_index 236
-#define VertexAttribP3ui_remap_index 237
-#define VertexAttribP3uiv_remap_index 238
-#define VertexAttribP4ui_remap_index 239
-#define VertexAttribP4uiv_remap_index 240
-#define VertexP2ui_remap_index 241
-#define VertexP2uiv_remap_index 242
-#define VertexP3ui_remap_index 243
-#define VertexP3uiv_remap_index 244
-#define VertexP4ui_remap_index 245
-#define VertexP4uiv_remap_index 246
-#define BindTransformFeedback_remap_index 247
-#define DeleteTransformFeedbacks_remap_index 248
-#define DrawTransformFeedback_remap_index 249
-#define GenTransformFeedbacks_remap_index 250
-#define IsTransformFeedback_remap_index 251
-#define PauseTransformFeedback_remap_index 252
-#define ResumeTransformFeedback_remap_index 253
-#define ClearDepthf_remap_index 254
-#define DepthRangef_remap_index 255
-#define GetShaderPrecisionFormat_remap_index 256
-#define ReleaseShaderCompiler_remap_index 257
-#define ShaderBinary_remap_index 258
-#define DebugMessageCallbackARB_remap_index 259
-#define DebugMessageControlARB_remap_index 260
-#define DebugMessageInsertARB_remap_index 261
-#define GetDebugMessageLogARB_remap_index 262
-#define GetGraphicsResetStatusARB_remap_index 263
-#define GetnColorTableARB_remap_index 264
-#define GetnCompressedTexImageARB_remap_index 265
-#define GetnConvolutionFilterARB_remap_index 266
-#define GetnHistogramARB_remap_index 267
-#define GetnMapdvARB_remap_index 268
-#define GetnMapfvARB_remap_index 269
-#define GetnMapivARB_remap_index 270
-#define GetnMinmaxARB_remap_index 271
-#define GetnPixelMapfvARB_remap_index 272
-#define GetnPixelMapuivARB_remap_index 273
-#define GetnPixelMapusvARB_remap_index 274
-#define GetnPolygonStippleARB_remap_index 275
-#define GetnSeparableFilterARB_remap_index 276
-#define GetnTexImageARB_remap_index 277
-#define GetnUniformdvARB_remap_index 278
-#define GetnUniformfvARB_remap_index 279
-#define GetnUniformivARB_remap_index 280
-#define GetnUniformuivARB_remap_index 281
-#define ReadnPixelsARB_remap_index 282
-#define TexStorage1D_remap_index 283
-#define TexStorage2D_remap_index 284
-#define TexStorage3D_remap_index 285
-#define TextureStorage1DEXT_remap_index 286
-#define TextureStorage2DEXT_remap_index 287
-#define TextureStorage3DEXT_remap_index 288
-#define PolygonOffsetEXT_remap_index 289
-#define GetPixelTexGenParameterfvSGIS_remap_index 290
-#define GetPixelTexGenParameterivSGIS_remap_index 291
-#define PixelTexGenParameterfSGIS_remap_index 292
-#define PixelTexGenParameterfvSGIS_remap_index 293
-#define PixelTexGenParameteriSGIS_remap_index 294
-#define PixelTexGenParameterivSGIS_remap_index 295
-#define SampleMaskSGIS_remap_index 296
-#define SamplePatternSGIS_remap_index 297
-#define ColorPointerEXT_remap_index 298
-#define EdgeFlagPointerEXT_remap_index 299
-#define IndexPointerEXT_remap_index 300
-#define NormalPointerEXT_remap_index 301
-#define TexCoordPointerEXT_remap_index 302
-#define VertexPointerEXT_remap_index 303
-#define PointParameterfEXT_remap_index 304
-#define PointParameterfvEXT_remap_index 305
-#define LockArraysEXT_remap_index 306
-#define UnlockArraysEXT_remap_index 307
-#define SecondaryColor3bEXT_remap_index 308
-#define SecondaryColor3bvEXT_remap_index 309
-#define SecondaryColor3dEXT_remap_index 310
-#define SecondaryColor3dvEXT_remap_index 311
-#define SecondaryColor3fEXT_remap_index 312
-#define SecondaryColor3fvEXT_remap_index 313
-#define SecondaryColor3iEXT_remap_index 314
-#define SecondaryColor3ivEXT_remap_index 315
-#define SecondaryColor3sEXT_remap_index 316
-#define SecondaryColor3svEXT_remap_index 317
-#define SecondaryColor3ubEXT_remap_index 318
-#define SecondaryColor3ubvEXT_remap_index 319
-#define SecondaryColor3uiEXT_remap_index 320
-#define SecondaryColor3uivEXT_remap_index 321
-#define SecondaryColor3usEXT_remap_index 322
-#define SecondaryColor3usvEXT_remap_index 323
-#define SecondaryColorPointerEXT_remap_index 324
-#define MultiDrawArraysEXT_remap_index 325
-#define MultiDrawElementsEXT_remap_index 326
-#define FogCoordPointerEXT_remap_index 327
-#define FogCoorddEXT_remap_index 328
-#define FogCoorddvEXT_remap_index 329
-#define FogCoordfEXT_remap_index 330
-#define FogCoordfvEXT_remap_index 331
-#define PixelTexGenSGIX_remap_index 332
-#define BlendFuncSeparateEXT_remap_index 333
-#define FlushVertexArrayRangeNV_remap_index 334
-#define VertexArrayRangeNV_remap_index 335
-#define CombinerInputNV_remap_index 336
-#define CombinerOutputNV_remap_index 337
-#define CombinerParameterfNV_remap_index 338
-#define CombinerParameterfvNV_remap_index 339
-#define CombinerParameteriNV_remap_index 340
-#define CombinerParameterivNV_remap_index 341
-#define FinalCombinerInputNV_remap_index 342
-#define GetCombinerInputParameterfvNV_remap_index 343
-#define GetCombinerInputParameterivNV_remap_index 344
-#define GetCombinerOutputParameterfvNV_remap_index 345
-#define GetCombinerOutputParameterivNV_remap_index 346
-#define GetFinalCombinerInputParameterfvNV_remap_index 347
-#define GetFinalCombinerInputParameterivNV_remap_index 348
-#define ResizeBuffersMESA_remap_index 349
-#define WindowPos2dMESA_remap_index 350
-#define WindowPos2dvMESA_remap_index 351
-#define WindowPos2fMESA_remap_index 352
-#define WindowPos2fvMESA_remap_index 353
-#define WindowPos2iMESA_remap_index 354
-#define WindowPos2ivMESA_remap_index 355
-#define WindowPos2sMESA_remap_index 356
-#define WindowPos2svMESA_remap_index 357
-#define WindowPos3dMESA_remap_index 358
-#define WindowPos3dvMESA_remap_index 359
-#define WindowPos3fMESA_remap_index 360
-#define WindowPos3fvMESA_remap_index 361
-#define WindowPos3iMESA_remap_index 362
-#define WindowPos3ivMESA_remap_index 363
-#define WindowPos3sMESA_remap_index 364
-#define WindowPos3svMESA_remap_index 365
-#define WindowPos4dMESA_remap_index 366
-#define WindowPos4dvMESA_remap_index 367
-#define WindowPos4fMESA_remap_index 368
-#define WindowPos4fvMESA_remap_index 369
-#define WindowPos4iMESA_remap_index 370
-#define WindowPos4ivMESA_remap_index 371
-#define WindowPos4sMESA_remap_index 372
-#define WindowPos4svMESA_remap_index 373
-#define MultiModeDrawArraysIBM_remap_index 374
-#define MultiModeDrawElementsIBM_remap_index 375
-#define DeleteFencesNV_remap_index 376
-#define FinishFenceNV_remap_index 377
-#define GenFencesNV_remap_index 378
-#define GetFenceivNV_remap_index 379
-#define IsFenceNV_remap_index 380
-#define SetFenceNV_remap_index 381
-#define TestFenceNV_remap_index 382
-#define AreProgramsResidentNV_remap_index 383
-#define BindProgramNV_remap_index 384
-#define DeleteProgramsNV_remap_index 385
-#define ExecuteProgramNV_remap_index 386
-#define GenProgramsNV_remap_index 387
-#define GetProgramParameterdvNV_remap_index 388
-#define GetProgramParameterfvNV_remap_index 389
-#define GetProgramStringNV_remap_index 390
-#define GetProgramivNV_remap_index 391
-#define GetTrackMatrixivNV_remap_index 392
-#define GetVertexAttribPointervNV_remap_index 393
-#define GetVertexAttribdvNV_remap_index 394
-#define GetVertexAttribfvNV_remap_index 395
-#define GetVertexAttribivNV_remap_index 396
-#define IsProgramNV_remap_index 397
-#define LoadProgramNV_remap_index 398
-#define ProgramParameters4dvNV_remap_index 399
-#define ProgramParameters4fvNV_remap_index 400
-#define RequestResidentProgramsNV_remap_index 401
-#define TrackMatrixNV_remap_index 402
-#define VertexAttrib1dNV_remap_index 403
-#define VertexAttrib1dvNV_remap_index 404
-#define VertexAttrib1fNV_remap_index 405
-#define VertexAttrib1fvNV_remap_index 406
-#define VertexAttrib1sNV_remap_index 407
-#define VertexAttrib1svNV_remap_index 408
-#define VertexAttrib2dNV_remap_index 409
-#define VertexAttrib2dvNV_remap_index 410
-#define VertexAttrib2fNV_remap_index 411
-#define VertexAttrib2fvNV_remap_index 412
-#define VertexAttrib2sNV_remap_index 413
-#define VertexAttrib2svNV_remap_index 414
-#define VertexAttrib3dNV_remap_index 415
-#define VertexAttrib3dvNV_remap_index 416
-#define VertexAttrib3fNV_remap_index 417
-#define VertexAttrib3fvNV_remap_index 418
-#define VertexAttrib3sNV_remap_index 419
-#define VertexAttrib3svNV_remap_index 420
-#define VertexAttrib4dNV_remap_index 421
-#define VertexAttrib4dvNV_remap_index 422
-#define VertexAttrib4fNV_remap_index 423
-#define VertexAttrib4fvNV_remap_index 424
-#define VertexAttrib4sNV_remap_index 425
-#define VertexAttrib4svNV_remap_index 426
-#define VertexAttrib4ubNV_remap_index 427
-#define VertexAttrib4ubvNV_remap_index 428
-#define VertexAttribPointerNV_remap_index 429
-#define VertexAttribs1dvNV_remap_index 430
-#define VertexAttribs1fvNV_remap_index 431
-#define VertexAttribs1svNV_remap_index 432
-#define VertexAttribs2dvNV_remap_index 433
-#define VertexAttribs2fvNV_remap_index 434
-#define VertexAttribs2svNV_remap_index 435
-#define VertexAttribs3dvNV_remap_index 436
-#define VertexAttribs3fvNV_remap_index 437
-#define VertexAttribs3svNV_remap_index 438
-#define VertexAttribs4dvNV_remap_index 439
-#define VertexAttribs4fvNV_remap_index 440
-#define VertexAttribs4svNV_remap_index 441
-#define VertexAttribs4ubvNV_remap_index 442
-#define GetTexBumpParameterfvATI_remap_index 443
-#define GetTexBumpParameterivATI_remap_index 444
-#define TexBumpParameterfvATI_remap_index 445
-#define TexBumpParameterivATI_remap_index 446
-#define AlphaFragmentOp1ATI_remap_index 447
-#define AlphaFragmentOp2ATI_remap_index 448
-#define AlphaFragmentOp3ATI_remap_index 449
-#define BeginFragmentShaderATI_remap_index 450
-#define BindFragmentShaderATI_remap_index 451
-#define ColorFragmentOp1ATI_remap_index 452
-#define ColorFragmentOp2ATI_remap_index 453
-#define ColorFragmentOp3ATI_remap_index 454
-#define DeleteFragmentShaderATI_remap_index 455
-#define EndFragmentShaderATI_remap_index 456
-#define GenFragmentShadersATI_remap_index 457
-#define PassTexCoordATI_remap_index 458
-#define SampleMapATI_remap_index 459
-#define SetFragmentShaderConstantATI_remap_index 460
-#define PointParameteriNV_remap_index 461
-#define PointParameterivNV_remap_index 462
-#define ActiveStencilFaceEXT_remap_index 463
-#define BindVertexArrayAPPLE_remap_index 464
-#define DeleteVertexArraysAPPLE_remap_index 465
-#define GenVertexArraysAPPLE_remap_index 466
-#define IsVertexArrayAPPLE_remap_index 467
-#define GetProgramNamedParameterdvNV_remap_index 468
-#define GetProgramNamedParameterfvNV_remap_index 469
-#define ProgramNamedParameter4dNV_remap_index 470
-#define ProgramNamedParameter4dvNV_remap_index 471
-#define ProgramNamedParameter4fNV_remap_index 472
-#define ProgramNamedParameter4fvNV_remap_index 473
-#define PrimitiveRestartIndexNV_remap_index 474
-#define PrimitiveRestartNV_remap_index 475
-#define DepthBoundsEXT_remap_index 476
-#define BlendEquationSeparateEXT_remap_index 477
-#define BindFramebufferEXT_remap_index 478
-#define BindRenderbufferEXT_remap_index 479
-#define CheckFramebufferStatusEXT_remap_index 480
-#define DeleteFramebuffersEXT_remap_index 481
-#define DeleteRenderbuffersEXT_remap_index 482
-#define FramebufferRenderbufferEXT_remap_index 483
-#define FramebufferTexture1DEXT_remap_index 484
-#define FramebufferTexture2DEXT_remap_index 485
-#define FramebufferTexture3DEXT_remap_index 486
-#define GenFramebuffersEXT_remap_index 487
-#define GenRenderbuffersEXT_remap_index 488
-#define GenerateMipmapEXT_remap_index 489
-#define GetFramebufferAttachmentParameterivEXT_remap_index 490
-#define GetRenderbufferParameterivEXT_remap_index 491
-#define IsFramebufferEXT_remap_index 492
-#define IsRenderbufferEXT_remap_index 493
-#define RenderbufferStorageEXT_remap_index 494
-#define BlitFramebufferEXT_remap_index 495
-#define BufferParameteriAPPLE_remap_index 496
-#define FlushMappedBufferRangeAPPLE_remap_index 497
-#define BindFragDataLocationEXT_remap_index 498
-#define GetFragDataLocationEXT_remap_index 499
-#define GetUniformuivEXT_remap_index 500
-#define GetVertexAttribIivEXT_remap_index 501
-#define GetVertexAttribIuivEXT_remap_index 502
-#define Uniform1uiEXT_remap_index 503
-#define Uniform1uivEXT_remap_index 504
-#define Uniform2uiEXT_remap_index 505
-#define Uniform2uivEXT_remap_index 506
-#define Uniform3uiEXT_remap_index 507
-#define Uniform3uivEXT_remap_index 508
-#define Uniform4uiEXT_remap_index 509
-#define Uniform4uivEXT_remap_index 510
-#define VertexAttribI1iEXT_remap_index 511
-#define VertexAttribI1ivEXT_remap_index 512
-#define VertexAttribI1uiEXT_remap_index 513
-#define VertexAttribI1uivEXT_remap_index 514
-#define VertexAttribI2iEXT_remap_index 515
-#define VertexAttribI2ivEXT_remap_index 516
-#define VertexAttribI2uiEXT_remap_index 517
-#define VertexAttribI2uivEXT_remap_index 518
-#define VertexAttribI3iEXT_remap_index 519
-#define VertexAttribI3ivEXT_remap_index 520
-#define VertexAttribI3uiEXT_remap_index 521
-#define VertexAttribI3uivEXT_remap_index 522
-#define VertexAttribI4bvEXT_remap_index 523
-#define VertexAttribI4iEXT_remap_index 524
-#define VertexAttribI4ivEXT_remap_index 525
-#define VertexAttribI4svEXT_remap_index 526
-#define VertexAttribI4ubvEXT_remap_index 527
-#define VertexAttribI4uiEXT_remap_index 528
-#define VertexAttribI4uivEXT_remap_index 529
-#define VertexAttribI4usvEXT_remap_index 530
-#define VertexAttribIPointerEXT_remap_index 531
-#define FramebufferTextureLayerEXT_remap_index 532
-#define ColorMaskIndexedEXT_remap_index 533
-#define DisableIndexedEXT_remap_index 534
-#define EnableIndexedEXT_remap_index 535
-#define GetBooleanIndexedvEXT_remap_index 536
-#define GetIntegerIndexedvEXT_remap_index 537
-#define IsEnabledIndexedEXT_remap_index 538
-#define ClearColorIiEXT_remap_index 539
-#define ClearColorIuiEXT_remap_index 540
-#define GetTexParameterIivEXT_remap_index 541
-#define GetTexParameterIuivEXT_remap_index 542
-#define TexParameterIivEXT_remap_index 543
-#define TexParameterIuivEXT_remap_index 544
-#define BeginConditionalRenderNV_remap_index 545
-#define EndConditionalRenderNV_remap_index 546
-#define BeginTransformFeedbackEXT_remap_index 547
-#define BindBufferBaseEXT_remap_index 548
-#define BindBufferOffsetEXT_remap_index 549
-#define BindBufferRangeEXT_remap_index 550
-#define EndTransformFeedbackEXT_remap_index 551
-#define GetTransformFeedbackVaryingEXT_remap_index 552
-#define TransformFeedbackVaryingsEXT_remap_index 553
-#define ProvokingVertexEXT_remap_index 554
-#define GetTexParameterPointervAPPLE_remap_index 555
-#define TextureRangeAPPLE_remap_index 556
-#define GetObjectParameterivAPPLE_remap_index 557
-#define ObjectPurgeableAPPLE_remap_index 558
-#define ObjectUnpurgeableAPPLE_remap_index 559
-#define ActiveProgramEXT_remap_index 560
-#define CreateShaderProgramEXT_remap_index 561
-#define UseShaderProgramEXT_remap_index 562
-#define TextureBarrierNV_remap_index 563
-#define StencilFuncSeparateATI_remap_index 564
-#define ProgramEnvParameters4fvEXT_remap_index 565
-#define ProgramLocalParameters4fvEXT_remap_index 566
-#define GetQueryObjecti64vEXT_remap_index 567
-#define GetQueryObjectui64vEXT_remap_index 568
-#define EGLImageTargetRenderbufferStorageOES_remap_index 569
-#define EGLImageTargetTexture2DOES_remap_index 570
+#define FramebufferTexture_remap_index 28
+#define GetBufferParameteri64v_remap_index 29
+#define GetInteger64i_v_remap_index 30
+#define VertexAttribDivisor_remap_index 31
+#define LoadTransposeMatrixdARB_remap_index 32
+#define LoadTransposeMatrixfARB_remap_index 33
+#define MultTransposeMatrixdARB_remap_index 34
+#define MultTransposeMatrixfARB_remap_index 35
+#define SampleCoverageARB_remap_index 36
+#define CompressedTexImage1DARB_remap_index 37
+#define CompressedTexImage2DARB_remap_index 38
+#define CompressedTexImage3DARB_remap_index 39
+#define CompressedTexSubImage1DARB_remap_index 40
+#define CompressedTexSubImage2DARB_remap_index 41
+#define CompressedTexSubImage3DARB_remap_index 42
+#define GetCompressedTexImageARB_remap_index 43
+#define DisableVertexAttribArrayARB_remap_index 44
+#define EnableVertexAttribArrayARB_remap_index 45
+#define GetProgramEnvParameterdvARB_remap_index 46
+#define GetProgramEnvParameterfvARB_remap_index 47
+#define GetProgramLocalParameterdvARB_remap_index 48
+#define GetProgramLocalParameterfvARB_remap_index 49
+#define GetProgramStringARB_remap_index 50
+#define GetProgramivARB_remap_index 51
+#define GetVertexAttribdvARB_remap_index 52
+#define GetVertexAttribfvARB_remap_index 53
+#define GetVertexAttribivARB_remap_index 54
+#define ProgramEnvParameter4dARB_remap_index 55
+#define ProgramEnvParameter4dvARB_remap_index 56
+#define ProgramEnvParameter4fARB_remap_index 57
+#define ProgramEnvParameter4fvARB_remap_index 58
+#define ProgramLocalParameter4dARB_remap_index 59
+#define ProgramLocalParameter4dvARB_remap_index 60
+#define ProgramLocalParameter4fARB_remap_index 61
+#define ProgramLocalParameter4fvARB_remap_index 62
+#define ProgramStringARB_remap_index 63
+#define VertexAttrib1dARB_remap_index 64
+#define VertexAttrib1dvARB_remap_index 65
+#define VertexAttrib1fARB_remap_index 66
+#define VertexAttrib1fvARB_remap_index 67
+#define VertexAttrib1sARB_remap_index 68
+#define VertexAttrib1svARB_remap_index 69
+#define VertexAttrib2dARB_remap_index 70
+#define VertexAttrib2dvARB_remap_index 71
+#define VertexAttrib2fARB_remap_index 72
+#define VertexAttrib2fvARB_remap_index 73
+#define VertexAttrib2sARB_remap_index 74
+#define VertexAttrib2svARB_remap_index 75
+#define VertexAttrib3dARB_remap_index 76
+#define VertexAttrib3dvARB_remap_index 77
+#define VertexAttrib3fARB_remap_index 78
+#define VertexAttrib3fvARB_remap_index 79
+#define VertexAttrib3sARB_remap_index 80
+#define VertexAttrib3svARB_remap_index 81
+#define VertexAttrib4NbvARB_remap_index 82
+#define VertexAttrib4NivARB_remap_index 83
+#define VertexAttrib4NsvARB_remap_index 84
+#define VertexAttrib4NubARB_remap_index 85
+#define VertexAttrib4NubvARB_remap_index 86
+#define VertexAttrib4NuivARB_remap_index 87
+#define VertexAttrib4NusvARB_remap_index 88
+#define VertexAttrib4bvARB_remap_index 89
+#define VertexAttrib4dARB_remap_index 90
+#define VertexAttrib4dvARB_remap_index 91
+#define VertexAttrib4fARB_remap_index 92
+#define VertexAttrib4fvARB_remap_index 93
+#define VertexAttrib4ivARB_remap_index 94
+#define VertexAttrib4sARB_remap_index 95
+#define VertexAttrib4svARB_remap_index 96
+#define VertexAttrib4ubvARB_remap_index 97
+#define VertexAttrib4uivARB_remap_index 98
+#define VertexAttrib4usvARB_remap_index 99
+#define VertexAttribPointerARB_remap_index 100
+#define BindBufferARB_remap_index 101
+#define BufferDataARB_remap_index 102
+#define BufferSubDataARB_remap_index 103
+#define DeleteBuffersARB_remap_index 104
+#define GenBuffersARB_remap_index 105
+#define GetBufferParameterivARB_remap_index 106
+#define GetBufferPointervARB_remap_index 107
+#define GetBufferSubDataARB_remap_index 108
+#define IsBufferARB_remap_index 109
+#define MapBufferARB_remap_index 110
+#define UnmapBufferARB_remap_index 111
+#define BeginQueryARB_remap_index 112
+#define DeleteQueriesARB_remap_index 113
+#define EndQueryARB_remap_index 114
+#define GenQueriesARB_remap_index 115
+#define GetQueryObjectivARB_remap_index 116
+#define GetQueryObjectuivARB_remap_index 117
+#define GetQueryivARB_remap_index 118
+#define IsQueryARB_remap_index 119
+#define AttachObjectARB_remap_index 120
+#define CompileShaderARB_remap_index 121
+#define CreateProgramObjectARB_remap_index 122
+#define CreateShaderObjectARB_remap_index 123
+#define DeleteObjectARB_remap_index 124
+#define DetachObjectARB_remap_index 125
+#define GetActiveUniformARB_remap_index 126
+#define GetAttachedObjectsARB_remap_index 127
+#define GetHandleARB_remap_index 128
+#define GetInfoLogARB_remap_index 129
+#define GetObjectParameterfvARB_remap_index 130
+#define GetObjectParameterivARB_remap_index 131
+#define GetShaderSourceARB_remap_index 132
+#define GetUniformLocationARB_remap_index 133
+#define GetUniformfvARB_remap_index 134
+#define GetUniformivARB_remap_index 135
+#define LinkProgramARB_remap_index 136
+#define ShaderSourceARB_remap_index 137
+#define Uniform1fARB_remap_index 138
+#define Uniform1fvARB_remap_index 139
+#define Uniform1iARB_remap_index 140
+#define Uniform1ivARB_remap_index 141
+#define Uniform2fARB_remap_index 142
+#define Uniform2fvARB_remap_index 143
+#define Uniform2iARB_remap_index 144
+#define Uniform2ivARB_remap_index 145
+#define Uniform3fARB_remap_index 146
+#define Uniform3fvARB_remap_index 147
+#define Uniform3iARB_remap_index 148
+#define Uniform3ivARB_remap_index 149
+#define Uniform4fARB_remap_index 150
+#define Uniform4fvARB_remap_index 151
+#define Uniform4iARB_remap_index 152
+#define Uniform4ivARB_remap_index 153
+#define UniformMatrix2fvARB_remap_index 154
+#define UniformMatrix3fvARB_remap_index 155
+#define UniformMatrix4fvARB_remap_index 156
+#define UseProgramObjectARB_remap_index 157
+#define ValidateProgramARB_remap_index 158
+#define BindAttribLocationARB_remap_index 159
+#define GetActiveAttribARB_remap_index 160
+#define GetAttribLocationARB_remap_index 161
+#define DrawBuffersARB_remap_index 162
+#define ClampColorARB_remap_index 163
+#define DrawArraysInstancedARB_remap_index 164
+#define DrawElementsInstancedARB_remap_index 165
+#define RenderbufferStorageMultisample_remap_index 166
+#define FramebufferTextureARB_remap_index 167
+#define FramebufferTextureFaceARB_remap_index 168
+#define ProgramParameteriARB_remap_index 169
+#define VertexAttribDivisorARB_remap_index 170
+#define FlushMappedBufferRange_remap_index 171
+#define MapBufferRange_remap_index 172
+#define TexBufferARB_remap_index 173
+#define BindVertexArray_remap_index 174
+#define GenVertexArrays_remap_index 175
+#define CopyBufferSubData_remap_index 176
+#define ClientWaitSync_remap_index 177
+#define DeleteSync_remap_index 178
+#define FenceSync_remap_index 179
+#define GetInteger64v_remap_index 180
+#define GetSynciv_remap_index 181
+#define IsSync_remap_index 182
+#define WaitSync_remap_index 183
+#define DrawElementsBaseVertex_remap_index 184
+#define DrawElementsInstancedBaseVertex_remap_index 185
+#define DrawRangeElementsBaseVertex_remap_index 186
+#define MultiDrawElementsBaseVertex_remap_index 187
+#define BlendEquationSeparateiARB_remap_index 188
+#define BlendEquationiARB_remap_index 189
+#define BlendFuncSeparateiARB_remap_index 190
+#define BlendFunciARB_remap_index 191
+#define BindFragDataLocationIndexed_remap_index 192
+#define GetFragDataIndex_remap_index 193
+#define BindSampler_remap_index 194
+#define DeleteSamplers_remap_index 195
+#define GenSamplers_remap_index 196
+#define GetSamplerParameterIiv_remap_index 197
+#define GetSamplerParameterIuiv_remap_index 198
+#define GetSamplerParameterfv_remap_index 199
+#define GetSamplerParameteriv_remap_index 200
+#define IsSampler_remap_index 201
+#define SamplerParameterIiv_remap_index 202
+#define SamplerParameterIuiv_remap_index 203
+#define SamplerParameterf_remap_index 204
+#define SamplerParameterfv_remap_index 205
+#define SamplerParameteri_remap_index 206
+#define SamplerParameteriv_remap_index 207
+#define ColorP3ui_remap_index 208
+#define ColorP3uiv_remap_index 209
+#define ColorP4ui_remap_index 210
+#define ColorP4uiv_remap_index 211
+#define MultiTexCoordP1ui_remap_index 212
+#define MultiTexCoordP1uiv_remap_index 213
+#define MultiTexCoordP2ui_remap_index 214
+#define MultiTexCoordP2uiv_remap_index 215
+#define MultiTexCoordP3ui_remap_index 216
+#define MultiTexCoordP3uiv_remap_index 217
+#define MultiTexCoordP4ui_remap_index 218
+#define MultiTexCoordP4uiv_remap_index 219
+#define NormalP3ui_remap_index 220
+#define NormalP3uiv_remap_index 221
+#define SecondaryColorP3ui_remap_index 222
+#define SecondaryColorP3uiv_remap_index 223
+#define TexCoordP1ui_remap_index 224
+#define TexCoordP1uiv_remap_index 225
+#define TexCoordP2ui_remap_index 226
+#define TexCoordP2uiv_remap_index 227
+#define TexCoordP3ui_remap_index 228
+#define TexCoordP3uiv_remap_index 229
+#define TexCoordP4ui_remap_index 230
+#define TexCoordP4uiv_remap_index 231
+#define VertexAttribP1ui_remap_index 232
+#define VertexAttribP1uiv_remap_index 233
+#define VertexAttribP2ui_remap_index 234
+#define VertexAttribP2uiv_remap_index 235
+#define VertexAttribP3ui_remap_index 236
+#define VertexAttribP3uiv_remap_index 237
+#define VertexAttribP4ui_remap_index 238
+#define VertexAttribP4uiv_remap_index 239
+#define VertexP2ui_remap_index 240
+#define VertexP2uiv_remap_index 241
+#define VertexP3ui_remap_index 242
+#define VertexP3uiv_remap_index 243
+#define VertexP4ui_remap_index 244
+#define VertexP4uiv_remap_index 245
+#define BindTransformFeedback_remap_index 246
+#define DeleteTransformFeedbacks_remap_index 247
+#define DrawTransformFeedback_remap_index 248
+#define GenTransformFeedbacks_remap_index 249
+#define IsTransformFeedback_remap_index 250
+#define PauseTransformFeedback_remap_index 251
+#define ResumeTransformFeedback_remap_index 252
+#define ClearDepthf_remap_index 253
+#define DepthRangef_remap_index 254
+#define GetShaderPrecisionFormat_remap_index 255
+#define ReleaseShaderCompiler_remap_index 256
+#define ShaderBinary_remap_index 257
+#define DebugMessageCallbackARB_remap_index 258
+#define DebugMessageControlARB_remap_index 259
+#define DebugMessageInsertARB_remap_index 260
+#define GetDebugMessageLogARB_remap_index 261
+#define GetGraphicsResetStatusARB_remap_index 262
+#define GetnColorTableARB_remap_index 263
+#define GetnCompressedTexImageARB_remap_index 264
+#define GetnConvolutionFilterARB_remap_index 265
+#define GetnHistogramARB_remap_index 266
+#define GetnMapdvARB_remap_index 267
+#define GetnMapfvARB_remap_index 268
+#define GetnMapivARB_remap_index 269
+#define GetnMinmaxARB_remap_index 270
+#define GetnPixelMapfvARB_remap_index 271
+#define GetnPixelMapuivARB_remap_index 272
+#define GetnPixelMapusvARB_remap_index 273
+#define GetnPolygonStippleARB_remap_index 274
+#define GetnSeparableFilterARB_remap_index 275
+#define GetnTexImageARB_remap_index 276
+#define GetnUniformdvARB_remap_index 277
+#define GetnUniformfvARB_remap_index 278
+#define GetnUniformivARB_remap_index 279
+#define GetnUniformuivARB_remap_index 280
+#define ReadnPixelsARB_remap_index 281
+#define TexStorage1D_remap_index 282
+#define TexStorage2D_remap_index 283
+#define TexStorage3D_remap_index 284
+#define TextureStorage1DEXT_remap_index 285
+#define TextureStorage2DEXT_remap_index 286
+#define TextureStorage3DEXT_remap_index 287
+#define PolygonOffsetEXT_remap_index 288
+#define GetPixelTexGenParameterfvSGIS_remap_index 289
+#define GetPixelTexGenParameterivSGIS_remap_index 290
+#define PixelTexGenParameterfSGIS_remap_index 291
+#define PixelTexGenParameterfvSGIS_remap_index 292
+#define PixelTexGenParameteriSGIS_remap_index 293
+#define PixelTexGenParameterivSGIS_remap_index 294
+#define SampleMaskSGIS_remap_index 295
+#define SamplePatternSGIS_remap_index 296
+#define ColorPointerEXT_remap_index 297
+#define EdgeFlagPointerEXT_remap_index 298
+#define IndexPointerEXT_remap_index 299
+#define NormalPointerEXT_remap_index 300
+#define TexCoordPointerEXT_remap_index 301
+#define VertexPointerEXT_remap_index 302
+#define PointParameterfEXT_remap_index 303
+#define PointParameterfvEXT_remap_index 304
+#define LockArraysEXT_remap_index 305
+#define UnlockArraysEXT_remap_index 306
+#define SecondaryColor3bEXT_remap_index 307
+#define SecondaryColor3bvEXT_remap_index 308
+#define SecondaryColor3dEXT_remap_index 309
+#define SecondaryColor3dvEXT_remap_index 310
+#define SecondaryColor3fEXT_remap_index 311
+#define SecondaryColor3fvEXT_remap_index 312
+#define SecondaryColor3iEXT_remap_index 313
+#define SecondaryColor3ivEXT_remap_index 314
+#define SecondaryColor3sEXT_remap_index 315
+#define SecondaryColor3svEXT_remap_index 316
+#define SecondaryColor3ubEXT_remap_index 317
+#define SecondaryColor3ubvEXT_remap_index 318
+#define SecondaryColor3uiEXT_remap_index 319
+#define SecondaryColor3uivEXT_remap_index 320
+#define SecondaryColor3usEXT_remap_index 321
+#define SecondaryColor3usvEXT_remap_index 322
+#define SecondaryColorPointerEXT_remap_index 323
+#define MultiDrawArraysEXT_remap_index 324
+#define MultiDrawElementsEXT_remap_index 325
+#define FogCoordPointerEXT_remap_index 326
+#define FogCoorddEXT_remap_index 327
+#define FogCoorddvEXT_remap_index 328
+#define FogCoordfEXT_remap_index 329
+#define FogCoordfvEXT_remap_index 330
+#define PixelTexGenSGIX_remap_index 331
+#define BlendFuncSeparateEXT_remap_index 332
+#define FlushVertexArrayRangeNV_remap_index 333
+#define VertexArrayRangeNV_remap_index 334
+#define CombinerInputNV_remap_index 335
+#define CombinerOutputNV_remap_index 336
+#define CombinerParameterfNV_remap_index 337
+#define CombinerParameterfvNV_remap_index 338
+#define CombinerParameteriNV_remap_index 339
+#define CombinerParameterivNV_remap_index 340
+#define FinalCombinerInputNV_remap_index 341
+#define GetCombinerInputParameterfvNV_remap_index 342
+#define GetCombinerInputParameterivNV_remap_index 343
+#define GetCombinerOutputParameterfvNV_remap_index 344
+#define GetCombinerOutputParameterivNV_remap_index 345
+#define GetFinalCombinerInputParameterfvNV_remap_index 346
+#define GetFinalCombinerInputParameterivNV_remap_index 347
+#define ResizeBuffersMESA_remap_index 348
+#define WindowPos2dMESA_remap_index 349
+#define WindowPos2dvMESA_remap_index 350
+#define WindowPos2fMESA_remap_index 351
+#define WindowPos2fvMESA_remap_index 352
+#define WindowPos2iMESA_remap_index 353
+#define WindowPos2ivMESA_remap_index 354
+#define WindowPos2sMESA_remap_index 355
+#define WindowPos2svMESA_remap_index 356
+#define WindowPos3dMESA_remap_index 357
+#define WindowPos3dvMESA_remap_index 358
+#define WindowPos3fMESA_remap_index 359
+#define WindowPos3fvMESA_remap_index 360
+#define WindowPos3iMESA_remap_index 361
+#define WindowPos3ivMESA_remap_index 362
+#define WindowPos3sMESA_remap_index 363
+#define WindowPos3svMESA_remap_index 364
+#define WindowPos4dMESA_remap_index 365
+#define WindowPos4dvMESA_remap_index 366
+#define WindowPos4fMESA_remap_index 367
+#define WindowPos4fvMESA_remap_index 368
+#define WindowPos4iMESA_remap_index 369
+#define WindowPos4ivMESA_remap_index 370
+#define WindowPos4sMESA_remap_index 371
+#define WindowPos4svMESA_remap_index 372
+#define MultiModeDrawArraysIBM_remap_index 373
+#define MultiModeDrawElementsIBM_remap_index 374
+#define DeleteFencesNV_remap_index 375
+#define FinishFenceNV_remap_index 376
+#define GenFencesNV_remap_index 377
+#define GetFenceivNV_remap_index 378
+#define IsFenceNV_remap_index 379
+#define SetFenceNV_remap_index 380
+#define TestFenceNV_remap_index 381
+#define AreProgramsResidentNV_remap_index 382
+#define BindProgramNV_remap_index 383
+#define DeleteProgramsNV_remap_index 384
+#define ExecuteProgramNV_remap_index 385
+#define GenProgramsNV_remap_index 386
+#define GetProgramParameterdvNV_remap_index 387
+#define GetProgramParameterfvNV_remap_index 388
+#define GetProgramStringNV_remap_index 389
+#define GetProgramivNV_remap_index 390
+#define GetTrackMatrixivNV_remap_index 391
+#define GetVertexAttribPointervNV_remap_index 392
+#define GetVertexAttribdvNV_remap_index 393
+#define GetVertexAttribfvNV_remap_index 394
+#define GetVertexAttribivNV_remap_index 395
+#define IsProgramNV_remap_index 396
+#define LoadProgramNV_remap_index 397
+#define ProgramParameters4dvNV_remap_index 398
+#define ProgramParameters4fvNV_remap_index 399
+#define RequestResidentProgramsNV_remap_index 400
+#define TrackMatrixNV_remap_index 401
+#define VertexAttrib1dNV_remap_index 402
+#define VertexAttrib1dvNV_remap_index 403
+#define VertexAttrib1fNV_remap_index 404
+#define VertexAttrib1fvNV_remap_index 405
+#define VertexAttrib1sNV_remap_index 406
+#define VertexAttrib1svNV_remap_index 407
+#define VertexAttrib2dNV_remap_index 408
+#define VertexAttrib2dvNV_remap_index 409
+#define VertexAttrib2fNV_remap_index 410
+#define VertexAttrib2fvNV_remap_index 411
+#define VertexAttrib2sNV_remap_index 412
+#define VertexAttrib2svNV_remap_index 413
+#define VertexAttrib3dNV_remap_index 414
+#define VertexAttrib3dvNV_remap_index 415
+#define VertexAttrib3fNV_remap_index 416
+#define VertexAttrib3fvNV_remap_index 417
+#define VertexAttrib3sNV_remap_index 418
+#define VertexAttrib3svNV_remap_index 419
+#define VertexAttrib4dNV_remap_index 420
+#define VertexAttrib4dvNV_remap_index 421
+#define VertexAttrib4fNV_remap_index 422
+#define VertexAttrib4fvNV_remap_index 423
+#define VertexAttrib4sNV_remap_index 424
+#define VertexAttrib4svNV_remap_index 425
+#define VertexAttrib4ubNV_remap_index 426
+#define VertexAttrib4ubvNV_remap_index 427
+#define VertexAttribPointerNV_remap_index 428
+#define VertexAttribs1dvNV_remap_index 429
+#define VertexAttribs1fvNV_remap_index 430
+#define VertexAttribs1svNV_remap_index 431
+#define VertexAttribs2dvNV_remap_index 432
+#define VertexAttribs2fvNV_remap_index 433
+#define VertexAttribs2svNV_remap_index 434
+#define VertexAttribs3dvNV_remap_index 435
+#define VertexAttribs3fvNV_remap_index 436
+#define VertexAttribs3svNV_remap_index 437
+#define VertexAttribs4dvNV_remap_index 438
+#define VertexAttribs4fvNV_remap_index 439
+#define VertexAttribs4svNV_remap_index 440
+#define VertexAttribs4ubvNV_remap_index 441
+#define GetTexBumpParameterfvATI_remap_index 442
+#define GetTexBumpParameterivATI_remap_index 443
+#define TexBumpParameterfvATI_remap_index 444
+#define TexBumpParameterivATI_remap_index 445
+#define AlphaFragmentOp1ATI_remap_index 446
+#define AlphaFragmentOp2ATI_remap_index 447
+#define AlphaFragmentOp3ATI_remap_index 448
+#define BeginFragmentShaderATI_remap_index 449
+#define BindFragmentShaderATI_remap_index 450
+#define ColorFragmentOp1ATI_remap_index 451
+#define ColorFragmentOp2ATI_remap_index 452
+#define ColorFragmentOp3ATI_remap_index 453
+#define DeleteFragmentShaderATI_remap_index 454
+#define EndFragmentShaderATI_remap_index 455
+#define GenFragmentShadersATI_remap_index 456
+#define PassTexCoordATI_remap_index 457
+#define SampleMapATI_remap_index 458
+#define SetFragmentShaderConstantATI_remap_index 459
+#define PointParameteriNV_remap_index 460
+#define PointParameterivNV_remap_index 461
+#define ActiveStencilFaceEXT_remap_index 462
+#define BindVertexArrayAPPLE_remap_index 463
+#define DeleteVertexArraysAPPLE_remap_index 464
+#define GenVertexArraysAPPLE_remap_index 465
+#define IsVertexArrayAPPLE_remap_index 466
+#define GetProgramNamedParameterdvNV_remap_index 467
+#define GetProgramNamedParameterfvNV_remap_index 468
+#define ProgramNamedParameter4dNV_remap_index 469
+#define ProgramNamedParameter4dvNV_remap_index 470
+#define ProgramNamedParameter4fNV_remap_index 471
+#define ProgramNamedParameter4fvNV_remap_index 472
+#define PrimitiveRestartIndexNV_remap_index 473
+#define PrimitiveRestartNV_remap_index 474
+#define DepthBoundsEXT_remap_index 475
+#define BlendEquationSeparateEXT_remap_index 476
+#define BindFramebufferEXT_remap_index 477
+#define BindRenderbufferEXT_remap_index 478
+#define CheckFramebufferStatusEXT_remap_index 479
+#define DeleteFramebuffersEXT_remap_index 480
+#define DeleteRenderbuffersEXT_remap_index 481
+#define FramebufferRenderbufferEXT_remap_index 482
+#define FramebufferTexture1DEXT_remap_index 483
+#define FramebufferTexture2DEXT_remap_index 484
+#define FramebufferTexture3DEXT_remap_index 485
+#define GenFramebuffersEXT_remap_index 486
+#define GenRenderbuffersEXT_remap_index 487
+#define GenerateMipmapEXT_remap_index 488
+#define GetFramebufferAttachmentParameterivEXT_remap_index 489
+#define GetRenderbufferParameterivEXT_remap_index 490
+#define IsFramebufferEXT_remap_index 491
+#define IsRenderbufferEXT_remap_index 492
+#define RenderbufferStorageEXT_remap_index 493
+#define BlitFramebufferEXT_remap_index 494
+#define BufferParameteriAPPLE_remap_index 495
+#define FlushMappedBufferRangeAPPLE_remap_index 496
+#define BindFragDataLocationEXT_remap_index 497
+#define GetFragDataLocationEXT_remap_index 498
+#define GetUniformuivEXT_remap_index 499
+#define GetVertexAttribIivEXT_remap_index 500
+#define GetVertexAttribIuivEXT_remap_index 501
+#define Uniform1uiEXT_remap_index 502
+#define Uniform1uivEXT_remap_index 503
+#define Uniform2uiEXT_remap_index 504
+#define Uniform2uivEXT_remap_index 505
+#define Uniform3uiEXT_remap_index 506
+#define Uniform3uivEXT_remap_index 507
+#define Uniform4uiEXT_remap_index 508
+#define Uniform4uivEXT_remap_index 509
+#define VertexAttribI1iEXT_remap_index 510
+#define VertexAttribI1ivEXT_remap_index 511
+#define VertexAttribI1uiEXT_remap_index 512
+#define VertexAttribI1uivEXT_remap_index 513
+#define VertexAttribI2iEXT_remap_index 514
+#define VertexAttribI2ivEXT_remap_index 515
+#define VertexAttribI2uiEXT_remap_index 516
+#define VertexAttribI2uivEXT_remap_index 517
+#define VertexAttribI3iEXT_remap_index 518
+#define VertexAttribI3ivEXT_remap_index 519
+#define VertexAttribI3uiEXT_remap_index 520
+#define VertexAttribI3uivEXT_remap_index 521
+#define VertexAttribI4bvEXT_remap_index 522
+#define VertexAttribI4iEXT_remap_index 523
+#define VertexAttribI4ivEXT_remap_index 524
+#define VertexAttribI4svEXT_remap_index 525
+#define VertexAttribI4ubvEXT_remap_index 526
+#define VertexAttribI4uiEXT_remap_index 527
+#define VertexAttribI4uivEXT_remap_index 528
+#define VertexAttribI4usvEXT_remap_index 529
+#define VertexAttribIPointerEXT_remap_index 530
+#define FramebufferTextureLayerEXT_remap_index 531
+#define ColorMaskIndexedEXT_remap_index 532
+#define DisableIndexedEXT_remap_index 533
+#define EnableIndexedEXT_remap_index 534
+#define GetBooleanIndexedvEXT_remap_index 535
+#define GetIntegerIndexedvEXT_remap_index 536
+#define IsEnabledIndexedEXT_remap_index 537
+#define ClearColorIiEXT_remap_index 538
+#define ClearColorIuiEXT_remap_index 539
+#define GetTexParameterIivEXT_remap_index 540
+#define GetTexParameterIuivEXT_remap_index 541
+#define TexParameterIivEXT_remap_index 542
+#define TexParameterIuivEXT_remap_index 543
+#define BeginConditionalRenderNV_remap_index 544
+#define EndConditionalRenderNV_remap_index 545
+#define BeginTransformFeedbackEXT_remap_index 546
+#define BindBufferBaseEXT_remap_index 547
+#define BindBufferOffsetEXT_remap_index 548
+#define BindBufferRangeEXT_remap_index 549
+#define EndTransformFeedbackEXT_remap_index 550
+#define GetTransformFeedbackVaryingEXT_remap_index 551
+#define TransformFeedbackVaryingsEXT_remap_index 552
+#define ProvokingVertexEXT_remap_index 553
+#define GetTexParameterPointervAPPLE_remap_index 554
+#define TextureRangeAPPLE_remap_index 555
+#define GetObjectParameterivAPPLE_remap_index 556
+#define ObjectPurgeableAPPLE_remap_index 557
+#define ObjectUnpurgeableAPPLE_remap_index 558
+#define ActiveProgramEXT_remap_index 559
+#define CreateShaderProgramEXT_remap_index 560
+#define UseShaderProgramEXT_remap_index 561
+#define TextureBarrierNV_remap_index 562
+#define StencilFuncSeparateATI_remap_index 563
+#define ProgramEnvParameters4fvEXT_remap_index 564
+#define ProgramLocalParameters4fvEXT_remap_index 565
+#define GetQueryObjecti64vEXT_remap_index 566
+#define GetQueryObjectui64vEXT_remap_index 567
+#define EGLImageTargetRenderbufferStorageOES_remap_index 568
+#define EGLImageTargetTexture2DOES_remap_index 569
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1653,7 +1651,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index]
 #define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index]
 #define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index]
-#define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index]
 #define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]
 #define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]
 #define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
@@ -6995,17 +6992,6 @@ static inline void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GL
    SET_by_offset(disp, _gloffset_GetStringi, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TexBuffer)(GLenum, GLenum, GLuint);
-#define CALL_TexBuffer(disp, parameters) \
-    (* GET_TexBuffer(disp)) parameters
-static inline _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) {
-   return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
-}
-
-static inline void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
-   SET_by_offset(disp, _gloffset_TexBuffer, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture)(GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTexture(disp, parameters) \
     (* GET_FramebufferTexture(disp)) parameters
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index f113573d8..8cfb97c26 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -10319,6 +10319,9 @@ _mesa_create_save_table(void)
    SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
 #endif
 
+   /* ARB 51. GL_ARB_texture_buffer_object */
+   SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */
+
    /* ARB 59. GL_ARB_copy_buffer */
    SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 8c262af08..3ce4cd559 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -750,6 +750,8 @@ get_extension_override( struct gl_context *ctx )
       }
    }
 
+   free(env);
+
    /* Remove trailing space. */
    len = strlen(extra_exts);
    if (extra_exts[len - 1] == ' ')
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index afc17dc49..7b830439d 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -511,17 +511,11 @@ static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )
 struct texenv_fragment_program {
    struct gl_shader_program *shader_program;
    struct gl_shader *shader;
-   struct gl_fragment_program *program;
    exec_list *instructions;
    exec_list *top_instructions;
    void *mem_ctx;
    struct state_key *state;
 
-   GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
-   GLbitfield temps_output;	/**< Track texture indirections, see spec. */
-   GLbitfield temp_in_use;	/**< Tracks temporary regs which are in use. */
-   GLboolean error;
-
    ir_variable *src_texture[MAX_TEXTURE_COORD_UNITS];
    /* Reg containing each texture unit's sampled texture color,
     * else undef.
@@ -537,8 +531,6 @@ struct texenv_fragment_program {
    ir_rvalue *src_previous;	/**< Reg containing color from previous
 				 * stage.  May need to be decl'd.
 				 */
-
-   GLuint last_tex_stage;	/**< Number of last enabled texture unit */
 };
 
 static ir_rvalue *
@@ -1359,7 +1351,6 @@ emit_instructions(struct texenv_fragment_program *p)
       for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources(p, unit);
-	    p->last_tex_stage = unit;
 	 }
 
       /* Second pass - emit combine instructions to build final color:
@@ -1465,8 +1456,6 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
 
    p.src_previous = NULL;
 
-   p.last_tex_stage = 0;
-
    ir_function *main_f = new(p.mem_ctx) ir_function("main");
    p.instructions->push_tail(main_f);
    state->symbols->add_function(main_f);
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index a3827d48d..8e441c232 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1329,6 +1329,8 @@ struct gl_texture_object
    /** GL_ARB_texture_buffer_object */
    struct gl_buffer_object *BufferObject;
    GLenum BufferObjectFormat;
+   /** Equivalent Mesa format for BufferObjectFormat. */
+   gl_format _BufferObjectFormat;
 
    /** GL_OES_EGL_image_external */
    GLint RequiredTextureImageUnits;
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index 4c9063c7c..1e672200a 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -211,4922 +211,4919 @@ static const char _mesa_function_pool[] =
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1181]: PauseTransformFeedback (will be remapped) */
-   "\0"
-   "glPauseTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[1208]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1181]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1290]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1263]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1316]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[1289]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[1337]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1310]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1383]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1356]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1429]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[1402]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[1457]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1430]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1477]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1450]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1492]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1465]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1507]: DebugMessageCallbackARB (will be remapped) */
+   /* _mesa_function_pool[1480]: DebugMessageCallbackARB (will be remapped) */
    "pp\0"
    "glDebugMessageCallbackARB\0"
    "\0"
-   /* _mesa_function_pool[1537]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1510]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1561]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1534]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1579]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1552]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1626]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1599]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1667]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1640]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1705]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[1678]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[1758]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1731]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1777]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[1750]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1808]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1781]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1850]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1823]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1879]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1852]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1895]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1868]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1938]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[1911]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[1983]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1956]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1997]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1970]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[2031]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[2004]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[2072]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[2045]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[2126]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[2099]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[2145]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2118]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2181]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[2154]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[2203]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[2176]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[2218]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[2191]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2264]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[2237]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2279]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2252]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2326]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2299]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2392]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2365]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2423]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2396]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2449]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[2422]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[2470]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2443]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2502]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2475]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2521]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2494]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2564]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2537]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2590]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2563]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2624]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2597]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2662]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2635]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2677]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2650]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2693]: TexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[2666]: TexCoordP1uiv (will be remapped) */
    "ip\0"
    "glTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[2713]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2686]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2732]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2705]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2756]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2729]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2771]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2744]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2833]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2806]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2878]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2851]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2926]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2899]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2942]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2915]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2972]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2945]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[3007]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2980]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[3054]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[3027]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[3105]: GetDebugMessageLogARB (will be remapped) */
+   /* _mesa_function_pool[3078]: GetDebugMessageLogARB (will be remapped) */
    "iipppppp\0"
    "glGetDebugMessageLogARB\0"
    "\0"
-   /* _mesa_function_pool[3139]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3112]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3164]: CallLists (offset 3) */
+   /* _mesa_function_pool[3137]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[3181]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[3154]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[3208]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[3181]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[3235]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[3208]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[3262]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[3235]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[3277]: PassThrough (offset 199) */
+   /* _mesa_function_pool[3250]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[3294]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[3267]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[3311]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[3284]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3355]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3328]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3446]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3419]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3476]: Viewport (offset 305) */
+   /* _mesa_function_pool[3449]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3493]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3466]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3540]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3513]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3562]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3535]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3589]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[3562]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[3620]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3593]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3647]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3620]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3697]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3670]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3744]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3717]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3765]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3738]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3793]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3766]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3818]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3791]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3843]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3816]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3879]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3852]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3919]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3892]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3956]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3929]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[4042]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[4015]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[4078]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[4051]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[4096]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[4069]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[4130]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[4103]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[4154]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[4127]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[4186]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[4159]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[4246]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[4219]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[4280]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[4253]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4297]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4270]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4312]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4285]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4338]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4311]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4375]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4348]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4435]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4408]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4449]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4422]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4513]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4486]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4534]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4507]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4575]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4548]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4590]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4563]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4607]: GetVertexAttribIuivEXT (will be remapped) */
+   /* _mesa_function_pool[4580]: GetVertexAttribIuivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[4659]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[4632]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[4688]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4661]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4733]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4706]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4750]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4723]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4786]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4759]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4820]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[4793]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[4842]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4815]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4880]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4853]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4916]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4889]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4930]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4903]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[4955]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[4928]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[4976]: TextureStorage1DEXT (will be remapped) */
+   /* _mesa_function_pool[4949]: TextureStorage1DEXT (will be remapped) */
    "iiiii\0"
    "glTextureStorage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[5005]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4978]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[5031]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5004]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5052]: VertexAttribP3ui (will be remapped) */
+   /* _mesa_function_pool[5025]: VertexAttribP3ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP3ui\0"
    "\0"
-   /* _mesa_function_pool[5077]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[5050]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[5103]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[5076]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[5133]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[5106]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[5189]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5162]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5220]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[5193]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[5250]: PointSize (offset 173) */
+   /* _mesa_function_pool[5223]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[5265]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[5238]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[5312]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5285]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5343]: PopName (offset 200) */
+   /* _mesa_function_pool[5316]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[5355]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[5328]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5384]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5357]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5411]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5384]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5435]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5408]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5461]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[5434]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[5478]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5451]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5523]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5496]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5571]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5544]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5586]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5559]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5613]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5586]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5658]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5631]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5675]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5648]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5700]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5673]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5719]: BindFragDataLocationIndexed (will be remapped) */
+   /* _mesa_function_pool[5692]: BindFragDataLocationIndexed (will be remapped) */
    "iiip\0"
    "glBindFragDataLocationIndexed\0"
    "\0"
-   /* _mesa_function_pool[5755]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5728]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5783]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[5756]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[5813]: Indexub (offset 315) */
+   /* _mesa_function_pool[5786]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5826]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5799]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5852]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[5825]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[5924]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5897]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5939]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5912]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5958]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5931]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5986]: TexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[5959]: TexCoordP4uiv (will be remapped) */
    "ip\0"
    "glTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[6006]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5979]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[6032]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[6005]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[6078]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[6051]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[6104]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6077]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6129]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[6102]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[6155]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[6128]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[6178]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[6151]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[6225]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[6198]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[6244]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[6217]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[6273]: Scaled (offset 301) */
+   /* _mesa_function_pool[6246]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[6287]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6260]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6315]: Scalef (offset 302) */
+   /* _mesa_function_pool[6288]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[6329]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6302]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6367]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[6340]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[6402]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[6375]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[6454]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[6427]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6484]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6457]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6500]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6473]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6555]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6528]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6569]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6542]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6586]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6559]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6644]: Rotated (offset 299) */
+   /* _mesa_function_pool[6617]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6660]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6633]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6712]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6685]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6736]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[6709]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[6778]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6751]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6800]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6773]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6815]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6788]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6844]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6817]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6868]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6841]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6882]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6855]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6903]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6876]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6924]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6897]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6949]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6922]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6994]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6967]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[7038]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[7011]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[7058]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7031]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7118]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[7091]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[7163]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[7136]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[7190]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[7163]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[7223]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[7196]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[7251]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7224]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7336]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[7309]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[7379]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[7352]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7404]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7377]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7443]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[7416]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[7461]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[7434]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[7486]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[7459]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[7513]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7486]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7555]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[7528]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7595]: GenLists (offset 5) */
+   /* _mesa_function_pool[7568]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7609]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7582]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7627]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7600]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7661]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7634]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7688]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7661]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7716]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7689]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7751]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7724]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7779]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7752]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7799]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7772]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7819]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7792]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7839]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7812]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7865]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7838]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7893]: Scissor (offset 176) */
+   /* _mesa_function_pool[7866]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7909]: Fogf (offset 153) */
+   /* _mesa_function_pool[7882]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7920]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7893]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7965]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7938]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[8009]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7982]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[8050]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[8023]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[8066]: Color4usv (offset 40) */
+   /* _mesa_function_pool[8039]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[8081]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[8054]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[8106]: Fogi (offset 155) */
+   /* _mesa_function_pool[8079]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[8117]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8090]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8134]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[8107]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[8152]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[8125]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[8181]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[8154]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[8198]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[8171]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[8216]: Color4ui (offset 37) */
+   /* _mesa_function_pool[8189]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[8233]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[8206]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[8252]: Color3usv (offset 24) */
+   /* _mesa_function_pool[8225]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[8267]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[8240]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[8287]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[8260]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[8304]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8277]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8353]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[8326]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[8370]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[8343]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[8389]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[8362]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[8408]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[8381]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[8439]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[8412]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[8491]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[8464]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[8508]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[8481]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[8557]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[8530]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8613]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[8586]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[8638]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8611]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8692]: Color4us (offset 39) */
+   /* _mesa_function_pool[8665]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8709]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8682]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8799]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8772]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8813]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8786]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8847]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8820]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8902]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8875]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8948]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8921]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8978]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8951]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[9015]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8988]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[9044]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[9017]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[9062]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[9035]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[9115]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[9088]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[9130]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9103]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9163]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[9136]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[9185]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9158]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9215]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[9188]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9262]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[9235]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[9306]: ColorTable (offset 339) */
+   /* _mesa_function_pool[9279]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[9359]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[9332]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[9379]: Accum (offset 213) */
+   /* _mesa_function_pool[9352]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[9391]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[9364]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[9412]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9385]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[9444]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[9417]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9500]: Finish (offset 216) */
+   /* _mesa_function_pool[9473]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[9511]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9484]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9535]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[9508]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[9553]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[9526]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[9596]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[9569]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9632]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9605]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9646]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9619]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9704]: Color4s (offset 33) */
+   /* _mesa_function_pool[9677]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9720]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9693]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9745]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9718]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9763]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9736]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9780]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9753]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9795]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9768]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9820]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9793]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9857]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9830]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9886]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9859]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9943]: Color4i (offset 31) */
+   /* _mesa_function_pool[9916]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9959]: Color4f (offset 29) */
+   /* _mesa_function_pool[9932]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9975]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9948]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9993]: Color4d (offset 27) */
+   /* _mesa_function_pool[9966]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[10009]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9982]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[10025]: Color4b (offset 25) */
+   /* _mesa_function_pool[9998]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[10041]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[10014]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[10058]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[10031]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[10088]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[10061]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[10106]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[10079]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10164]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[10137]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[10185]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[10158]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[10204]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[10177]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[10246]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[10219]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[10297]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[10270]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[10319]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[10292]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[10335]: EndList (offset 1) */
+   /* _mesa_function_pool[10308]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[10347]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[10320]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[10364]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[10337]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[10389]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[10362]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[10419]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[10392]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10453]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[10426]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[10471]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[10444]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[10522]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[10495]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[10541]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[10514]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[10556]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10529]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10584]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[10557]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[10612]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[10585]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10668]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10641]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10696]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10669]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10714]: DebugMessageControlARB (will be remapped) */
+   /* _mesa_function_pool[10687]: DebugMessageControlARB (will be remapped) */
    "iiiipi\0"
    "glDebugMessageControlARB\0"
    "\0"
-   /* _mesa_function_pool[10747]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10720]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10795]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10768]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10838]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[10811]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[10863]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10836]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10888]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10861]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10938]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10911]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10956]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10929]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[11008]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10981]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[11034]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[11007]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[11068]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[11041]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[11096]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[11069]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11142]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11115]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11168]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[11141]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[11191]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[11164]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[11218]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[11191]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[11249]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[11222]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[11264]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[11237]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[11291]: Color3us (offset 23) */
+   /* _mesa_function_pool[11264]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[11307]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[11280]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[11342]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[11315]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[11385]: End (offset 43) */
+   /* _mesa_function_pool[11358]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[11393]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[11366]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[11418]: MultiTexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[11391]: MultiTexCoordP3uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[11444]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[11417]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11470]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[11443]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[11500]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[11473]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[11545]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[11518]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11591]: Color3ub (offset 19) */
+   /* _mesa_function_pool[11564]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[11607]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[11580]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[11639]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[11612]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11664]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11637]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11699]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11672]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11722]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[11695]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11762]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11735]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11778]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11751]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11795]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11768]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11841]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11814]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11868]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11841]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11904]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11877]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11920]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11893]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11956]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11929]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11999]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11972]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[12021]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[11994]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[12041]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[12014]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[12087]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[12060]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[12120]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[12093]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[12144]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[12117]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12169]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[12142]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[12222]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[12195]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[12279]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[12252]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[12317]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[12290]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[12342]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[12315]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12385]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[12358]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[12432]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12405]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12496]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[12469]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[12540]: GetError (offset 261) */
+   /* _mesa_function_pool[12513]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[12553]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[12526]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[12572]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[12545]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[12589]: Indexdv (offset 45) */
+   /* _mesa_function_pool[12562]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[12602]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[12575]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[12658]: Normal3s (offset 60) */
+   /* _mesa_function_pool[12631]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[12674]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[12647]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12708]: PushName (offset 201) */
+   /* _mesa_function_pool[12681]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12722]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12695]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12767]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12740]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12792]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12765]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12808]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12781]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12843]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12816]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12900]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12873]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12943]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12916]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12964]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12937]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[13014]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[12987]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13040]: Normal3b (offset 52) */
+   /* _mesa_function_pool[13013]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[13056]: Normal3d (offset 54) */
+   /* _mesa_function_pool[13029]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[13072]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[13045]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[13105]: Normal3f (offset 56) */
+   /* _mesa_function_pool[13078]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[13121]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[13094]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[13166]: Indexi (offset 48) */
+   /* _mesa_function_pool[13139]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[13178]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[13151]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[13211]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[13184]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[13239]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[13212]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13260]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13233]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13289]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[13262]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[13335]: DepthMask (offset 211) */
+   /* _mesa_function_pool[13308]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[13350]: IsShader (will be remapped) */
+   /* _mesa_function_pool[13323]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[13364]: Indexf (offset 46) */
+   /* _mesa_function_pool[13337]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[13376]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13349]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13414]: Indexd (offset 44) */
+   /* _mesa_function_pool[13387]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[13426]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[13399]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[13447]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13420]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[13464]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[13437]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[13486]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[13459]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[13531]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[13504]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[13547]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[13520]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[13593]: Indexs (offset 50) */
+   /* _mesa_function_pool[13566]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[13605]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[13578]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[13624]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[13597]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13646]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[13619]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13672]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[13645]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13733]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13706]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13771]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13744]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13803]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13776]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13830]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13803]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13845]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13818]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13862]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13835]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13909]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13882]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13924]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13897]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13977]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13950]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13991]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13964]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[14013]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13986]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[14061]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14034]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14086]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[14059]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[14134]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[14107]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[14158]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[14131]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[14193]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14166]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14211]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14184]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14224]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[14197]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[14248]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[14221]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[14263]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14236]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14339]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[14312]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[14356]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[14329]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[14376]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[14349]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[14403]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[14376]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[14448]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[14421]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[14463]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14436]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14495]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[14468]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[14540]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[14513]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[14568]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[14541]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14585]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[14558]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14646]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[14619]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14668]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[14641]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14692]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14665]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14727]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14700]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14757]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[14730]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14783]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14756]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14839]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14812]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14878]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[14851]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[14910]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14883]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14943]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14916]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14965]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14938]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14993]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14966]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[15011]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14984]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[15036]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[15009]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[15054]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[15027]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[15069]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[15042]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[15085]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[15058]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[15102]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[15075]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[15129]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[15102]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[15153]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[15126]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[15170]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[15143]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15225]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[15198]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[15250]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[15223]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[15265]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[15238]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[15284]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[15257]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[15313]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[15286]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15356]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[15329]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15400]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[15373]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[15415]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[15388]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[15431]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[15404]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[15447]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[15420]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15481]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[15454]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15510]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[15483]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15555]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15528]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15611]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[15584]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15632]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[15605]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[15665]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[15638]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[15695]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15668]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15730]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15703]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15749]: Flush (offset 217) */
+   /* _mesa_function_pool[15722]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15759]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15732]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15774]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15747]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15820]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15793]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15842]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15815]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15878]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15851]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15896]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[15869]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[15915]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15888]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15958]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15931]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15982]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15955]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15998]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15971]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[16016]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[15989]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[16058]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[16031]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16080]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[16053]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[16100]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16073]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16141]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[16114]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[16196]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16169]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16214]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[16187]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[16238]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[16211]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16256]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[16229]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16274]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[16247]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[16328]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[16301]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[16370]: Color4ub (offset 35) */
+   /* _mesa_function_pool[16343]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16387]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[16360]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[16407]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[16380]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[16436]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[16409]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16454]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[16427]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[16514]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[16487]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[16533]: Indexiv (offset 49) */
+   /* _mesa_function_pool[16506]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[16546]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[16519]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[16564]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[16537]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[16608]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[16581]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[16668]: Frustum (offset 289) */
+   /* _mesa_function_pool[16641]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[16686]: GetString (offset 275) */
+   /* _mesa_function_pool[16659]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[16701]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[16674]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[16727]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16700]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16742]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[16715]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16760]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16733]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16778]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16751]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16808]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16781]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16826]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16799]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16871]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16844]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16915]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16888]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16958]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16931]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16985]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16958]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[17026]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16999]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17054]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[17027]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[17089]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[17062]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[17107]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[17080]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17138]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17111]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17172]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[17145]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[17198]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[17171]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[17223]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[17196]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[17279]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[17252]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[17298]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[17271]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[17314]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[17287]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[17362]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[17335]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17408]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[17381]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[17425]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[17398]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[17448]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[17421]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17481]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[17454]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[17508]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17481]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17535]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17508]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17572]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[17545]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[17599]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[17572]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[17619]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[17592]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[17640]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[17613]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17667]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17640]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17702]: Rectd (offset 86) */
+   /* _mesa_function_pool[17675]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[17716]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17689]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17742]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[17715]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[17779]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[17752]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17799]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17772]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17825]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[17798]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[17872]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17845]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17919]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17892]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17938]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17911]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17983]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17956]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[18008]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17981]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18038]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[18011]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[18085]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[18058]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[18133]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[18106]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[18191]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[18164]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[18225]: Lightfv (offset 160) */
+   /* _mesa_function_pool[18198]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[18240]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[18213]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[18293]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[18266]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[18309]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[18282]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[18329]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[18302]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[18351]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[18324]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[18394]: Color4fv (offset 30) */
+   /* _mesa_function_pool[18367]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[18408]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[18381]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18453]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[18426]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[18477]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18450]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18514]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[18487]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[18535]: Rects (offset 92) */
+   /* _mesa_function_pool[18508]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[18549]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18522]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[18583]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[18556]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[18608]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[18581]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[18630]: Lightiv (offset 162) */
+   /* _mesa_function_pool[18603]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[18645]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[18618]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[18689]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[18662]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[18737]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18710]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18762]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18735]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[18786]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18759]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18831]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18804]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18852]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18825]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18895]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18868]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18921]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18894]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18947]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18920]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18965]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18938]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[19008]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[18981]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[19062]: Rectdv (offset 87) */
+   /* _mesa_function_pool[19035]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[19075]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[19048]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[19101]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[19074]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[19151]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19124]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19210]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19183]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19238]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[19211]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[19283]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[19256]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[19361]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[19334]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[19388]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[19361]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19415]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[19388]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[19437]: Materialiv (offset 172) */
+   /* _mesa_function_pool[19410]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[19455]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[19428]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[19477]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[19450]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[19503]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19476]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19549]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[19522]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[19602]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[19575]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19648]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[19621]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[19666]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[19639]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[19730]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[19703]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[19754]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19727]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19796]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19769]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19823]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19796]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19850]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19823]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19875]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[19848]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[19917]: TexBuffer (will be remapped) */
-   "iii\0"
-   "glTexBuffer\0"
+   /* _mesa_function_pool[19890]: PauseTransformFeedback (will be remapped) */
+   "\0"
+   "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[19934]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19917]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19990]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19973]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[20018]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[20001]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[20037]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[20020]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[20075]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[20058]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[20093]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[20076]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[20117]: TexGeni (offset 192) */
+   /* _mesa_function_pool[20100]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[20132]: TexGenf (offset 190) */
+   /* _mesa_function_pool[20115]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[20147]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[20130]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[20180]: TexGend (offset 188) */
+   /* _mesa_function_pool[20163]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[20195]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[20178]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20222]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[20205]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[20245]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[20228]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20264]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[20247]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[20291]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[20274]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[20345]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[20328]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[20369]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[20352]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20387]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[20370]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20413]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[20396]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[20439]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20422]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20468]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[20451]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[20492]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[20475]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[20518]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[20501]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[20565]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[20548]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[20615]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[20598]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[20646]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[20629]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[20673]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[20656]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[20707]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20690]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[20721]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20704]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[20751]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20734]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20783]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20766]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20818]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20801]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20834]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20817]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20867]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20850]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20925]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20908]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20981]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20964]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[21011]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[20994]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[21031]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[21014]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[21050]: Color3dv (offset 12) */
+   /* _mesa_function_pool[21033]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[21064]: IsTexture (offset 330) */
+   /* _mesa_function_pool[21047]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[21094]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[21077]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[21112]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21095]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21137]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[21120]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21160]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[21143]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[21201]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[21184]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[21219]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[21202]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[21238]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[21221]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[21277]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[21260]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[21307]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[21290]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[21339]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[21322]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[21368]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[21351]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[21384]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[21367]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21412]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[21395]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[21429]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[21412]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[21471]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[21454]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[21489]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[21472]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[21515]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21498]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21564]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[21547]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[21582]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[21565]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[21627]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[21610]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[21661]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[21644]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[21685]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21668]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[21724]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21707]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[21753]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21736]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[21771]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21754]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[21814]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21797]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21834]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21817]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21902]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21885]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21957]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21940]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[21995]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21978]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[22029]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[22012]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[22077]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[22060]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[22105]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[22088]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[22158]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[22141]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22179]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[22162]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[22206]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[22189]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22238]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[22221]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[22258]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22241]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22284]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[22267]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[22306]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[22289]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[22324]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[22307]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[22347]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[22330]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[22374]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[22357]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[22424]: Color3s (offset 17) */
+   /* _mesa_function_pool[22407]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[22439]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[22422]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[22473]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[22456]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[22526]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[22509]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[22545]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[22528]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[22561]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[22544]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[22585]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[22568]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[22629]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[22612]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[22664]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22647]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[22687]: Color3i (offset 15) */
+   /* _mesa_function_pool[22670]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[22702]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22685]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[22717]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22700]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[22735]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22718]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[22783]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22766]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[22801]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22784]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22844]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22827]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22894]: Color3b (offset 9) */
+   /* _mesa_function_pool[22877]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22909]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22892]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[22953]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22936]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[22977]: Color3f (offset 13) */
+   /* _mesa_function_pool[22960]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[22992]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[22975]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[23012]: Color3d (offset 11) */
+   /* _mesa_function_pool[22995]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[23027]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[23010]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[23048]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[23031]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[23063]: Lightf (offset 159) */
+   /* _mesa_function_pool[23046]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[23077]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[23060]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[23103]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[23086]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[23119]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[23102]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[23140]: Lighti (offset 161) */
+   /* _mesa_function_pool[23123]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[23154]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[23137]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[23185]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[23168]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[23202]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[23185]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[23225]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[23208]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[23270]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[23253]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23355]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[23338]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23390]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[23373]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23435]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[23418]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23470]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[23453]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[23487]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[23470]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[23512]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[23495]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[23529]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[23512]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[23546]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[23529]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[23591]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23574]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23634]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[23617]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[23665]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[23648]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[23686]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[23669]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[23741]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23724]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23767]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23750]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23812]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23795]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23846]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[23829]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[23870]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23853]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23897]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23880]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23922]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23905]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23947]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23930]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[23974]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23957]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[24003]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[23986]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[24068]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[24051]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[24091]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[24074]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[24110]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24093]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24137]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[24120]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[24163]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[24146]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[24181]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[24164]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[24226]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[24209]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[24269]: ClearColor (offset 206) */
+   /* _mesa_function_pool[24252]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[24288]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[24271]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[24307]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[24290]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[24331]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24314]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24380]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[24363]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[24407]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24390]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[24446]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[24429]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24462]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[24445]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[24510]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[24493]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24530]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[24513]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[24578]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[24561]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[24602]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24585]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24643]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[24626]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[24675]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[24658]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[24693]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[24676]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24785]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24768]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24816]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24799]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[24834]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24817]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[24879]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24862]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24910]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24893]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24946]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24929]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24989]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[24972]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[25017]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[25000]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[25043]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[25026]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[25075]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[25058]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[25090]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[25073]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[25108]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25091]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25148]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[25131]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[25175]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[25158]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[25204]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[25187]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[25223]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[25206]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[25271]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[25254]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[25306]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[25289]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[25333]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[25316]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[25357]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[25340]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25391]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[25374]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[25443]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[25426]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[25462]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[25445]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[25493]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[25476]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[25531]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[25514]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[25574]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[25557]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[25619]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[25602]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[25639]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25622]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25710]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[25693]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25732]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[25715]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[25752]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[25735]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[25806]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25789]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25859]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25842]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[25887]: Map1d (offset 220) */
+   /* _mesa_function_pool[25870]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[25903]: Map1f (offset 221) */
+   /* _mesa_function_pool[25886]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[25919]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25902]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25978]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25961]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[26014]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[25997]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[26038]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[26021]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[26059]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[26042]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26090]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[26073]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[26129]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[26112]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[26151]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[26134]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[26196]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[26179]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[26252]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[26235]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26306]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[26289]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[26327]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[26310]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26373]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[26356]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[26388]: Fogiv (offset 156) */
+   /* _mesa_function_pool[26371]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[26400]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[26383]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26417]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[26400]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[26453]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[26436]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[26474]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[26457]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[26501]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[26484]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[26525]: Rotatef (offset 300) */
+   /* _mesa_function_pool[26508]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[26541]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[26524]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26583]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[26566]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[26599]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[26582]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[26624]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[26607]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[26640]: Clear (offset 203) */
+   /* _mesa_function_pool[26623]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[26651]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[26634]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[26667]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[26650]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26694]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[26677]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[26728]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[26711]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[26744]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[26727]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[26800]: Ortho (offset 296) */
+   /* _mesa_function_pool[26783]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[26816]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[26799]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[26837]: ListBase (offset 6) */
+   /* _mesa_function_pool[26820]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[26851]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[26834]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[26896]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[26879]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26920]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26903]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[26936]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26919]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[26992]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26975]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[27084]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[27067]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27141]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[27124]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[27157]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[27140]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[27224]: Rectiv (offset 91) */
+   /* _mesa_function_pool[27207]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[27237]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[27220]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[27275]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27258]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27302]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[27285]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[27352]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[27335]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[27375]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[27358]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[27394]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27377]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27423]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[27406]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[27443]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[27426]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27489]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[27472]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[27512]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[27495]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[27527]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[27510]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[27572]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[27555]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[27617]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[27600]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[27663]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[27646]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[27698]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[27681]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[27713]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[27696]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[27761]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[27744]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[27796]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[27779]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[27839]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[27822]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[27856]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[27839]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27895]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[27878]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[27938]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27921]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27985]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27968]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[28073]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28056]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[28108]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[28091]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[28153]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[28136]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[28185]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[28168]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[28200]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[28183]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[28226]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[28209]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[28252]: LineWidth (offset 168) */
+   /* _mesa_function_pool[28235]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[28267]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[28250]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28286]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28269]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28317]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28300]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28355]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[28338]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[28401]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[28384]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28421]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[28404]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[28442]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[28425]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[28472]: TexGendv (offset 189) */
+   /* _mesa_function_pool[28455]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[28488]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[28471]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[28533]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28516]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[28566]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[28549]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[28591]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[28574]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[28612]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[28595]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28646]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[28629]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28673]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[28656]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[28696]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[28679]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[28722]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[28705]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28786]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[28769]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28812]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[28795]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[28856]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[28839]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[28887]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[28870]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[28924]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[28907]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28945]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[28928]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[28967]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[28950]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[29018]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[29001]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[29053]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[29036]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[29074]: CallList (offset 2) */
+   /* _mesa_function_pool[29057]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[29088]: Materialfv (offset 170) */
+   /* _mesa_function_pool[29071]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[29106]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[29089]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[29123]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[29106]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29155]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[29138]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[29200]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[29183]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[29248]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[29231]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[29293]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29276]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29311]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[29294]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[29364]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[29347]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[29395]: Color3iv (offset 16) */
+   /* _mesa_function_pool[29378]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[29409]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[29392]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[29443]: DrawElements (offset 311) */
+   /* _mesa_function_pool[29426]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[29464]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[29447]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[29490]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29473]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29527]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[29510]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29587]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[29570]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[29630]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[29613]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[29685]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[29668]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[29708]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[29691]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
+   "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[29728]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[29723]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[29801]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29796]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[29824]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[29819]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29855]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29850]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29892]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[29887]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[29909]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[29904]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[29945]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[29940]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[29961]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[29956]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[29981]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[29976]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[29995]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[29990]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[30014]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[30009]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[30034]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[30029]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[30083]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[30078]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[30129]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[30124]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[30148]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[30143]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[30174]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[30169]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[30217]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[30212]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[30242]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[30237]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30287]: Map2d (offset 222) */
+   /* _mesa_function_pool[30282]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30307]: Map2f (offset 223) */
+   /* _mesa_function_pool[30302]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30327]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30322]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30352]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[30347]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[30369]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[30364]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30398]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[30393]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[30423]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[30418]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[30446]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[30441]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[30463]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[30458]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[30480]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[30475]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[30497]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[30492]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[30515]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[30510]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[30545]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[30540]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[30571]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[30566]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[30597]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[30592]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30620]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[30615]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[30676]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[30671]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[30695]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[30690]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[30712]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[30707]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[30743]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30738]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30783]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[30778]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[30809]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[30804]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[30840]: Materialf (offset 169) */
+   /* _mesa_function_pool[30835]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[30857]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[30852]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[30902]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30897]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30927]: Materiali (offset 171) */
+   /* _mesa_function_pool[30922]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[30944]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[30939]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[30970]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[30965]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[31005]: Indexsv (offset 51) */
+   /* _mesa_function_pool[31000]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[31018]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[31013]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[31063]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[31058]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[31082]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[31077]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[31099]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[31094]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[31132]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[31127]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[31150]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31145]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31187]: Translated (offset 303) */
+   /* _mesa_function_pool[31182]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[31205]: Translatef (offset 304) */
+   /* _mesa_function_pool[31200]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[31223]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[31218]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31258]: StencilMask (offset 209) */
+   /* _mesa_function_pool[31253]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[31275]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31270]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31295]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[31290]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[31315]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[31310]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[31333]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[31328]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31363]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[31358]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[31389]: IsList (offset 287) */
+   /* _mesa_function_pool[31384]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[31401]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[31396]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[31427]: IsSync (will be remapped) */
+   /* _mesa_function_pool[31422]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[31439]: RenderMode (offset 196) */
+   /* _mesa_function_pool[31434]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[31455]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[31450]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[31488]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31483]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[31556]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[31551]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[31577]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[31572]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[31614]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[31609]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31642]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[31637]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[31684]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[31679]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[31727]: LoadName (offset 198) */
+   /* _mesa_function_pool[31722]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[31741]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[31736]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[31768]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[31763]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[31786]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[31781]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[31803]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[31798]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[31837]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[31832]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31888]: CullFace (offset 152) */
+   /* _mesa_function_pool[31883]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[31902]: BindTexture (offset 307) */
+   /* _mesa_function_pool[31897]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[31937]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[31932]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[31963]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[31958]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[32009]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[32004]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[32035]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[32030]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[32054]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[32049]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[32074]: Rectsv (offset 93) */
+   /* _mesa_function_pool[32069]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[32087]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[32082]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[32114]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[32109]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[32140]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[32135]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[32198]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32193]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32224]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[32219]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[32287]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[32282]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[32342]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[32337]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[32369]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[32364]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[32390]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[32385]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32412]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[32407]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32440]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[32435]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[32464]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[32459]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[32509]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[32504]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[32528]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[32523]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[32575]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[32570]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[32602]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[32597]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[32618]: Recti (offset 90) */
+   /* _mesa_function_pool[32613]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[32632]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[32627]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[32654]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[32649]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[32693]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[32688]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[32721]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32716]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32750]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32745]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[32789]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[32784]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[32823]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[32818]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[32845]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[32840]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[32866]: Rectf (offset 88) */
+   /* _mesa_function_pool[32861]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[32880]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[32875]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[32903]: Indexfv (offset 47) */
+   /* _mesa_function_pool[32898]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[32916]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[32911]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[32933]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[32928]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32979]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[32974]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[33031]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[33026]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[33066]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[33061]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[33086]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[33081]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[33113]: IndexMask (offset 212) */
+   /* _mesa_function_pool[33108]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[33128]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[33123]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[33165]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[33160]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[33208]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[33203]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[33224]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[33219]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[33250]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[33245]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[33269]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[33264]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[33291]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[33286]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[33310]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[33305]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[33327]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33322]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33354]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[33349]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[33368]: Fogfv (offset 154) */
+   /* _mesa_function_pool[33363]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[33380]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[33375]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33414]: InitNames (offset 197) */
+   /* _mesa_function_pool[33409]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[33428]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[33423]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[33443]: Minmax (offset 368) */
+   /* _mesa_function_pool[33438]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[33469]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[33464]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[33488]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[33483]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[33527]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[33522]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[33546]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[33541]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[33578]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[33573]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[33600]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[33595]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[33630]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[33625]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[33650]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[33645]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[33668]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[33663]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[33705]: Hint (offset 158) */
+   /* _mesa_function_pool[33700]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[33716]: Color4dv (offset 28) */
+   /* _mesa_function_pool[33711]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[33730]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[33725]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[33773]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[33768]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[33802]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[33797]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[33857]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[33852]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[33907]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[33902]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[33925]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[33920]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[33976]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[33971]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[34023]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[34018]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[34047]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[34042]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[34078]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[34073]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[34093]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[34088]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[34128]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[34123]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[34145]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[34140]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34165]: Begin (offset 7) */
+   /* _mesa_function_pool[34160]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[34176]: LightModeli (offset 165) */
+   /* _mesa_function_pool[34171]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[34194]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[34189]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[34225]: Rectfv (offset 89) */
+   /* _mesa_function_pool[34220]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[34238]: LightModelf (offset 163) */
+   /* _mesa_function_pool[34233]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[34256]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[34251]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[34281]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[34276]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34299]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[34294]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34335]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[34330]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34361]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[34356]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[34379]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34374]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34418]: Disable (offset 214) */
+   /* _mesa_function_pool[34413]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[34431]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[34426]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[34476]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[34471]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34542]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34537]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34570]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[34565]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[34597]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[34592]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34631]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[34626]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[34650]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[34645]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[34700]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[34695]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[34742]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[34737]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[34768]: ColorMask (offset 210) */
+   /* _mesa_function_pool[34763]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[34786]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[34781]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[34811]: DebugMessageInsertARB (will be remapped) */
+   /* _mesa_function_pool[34806]: DebugMessageInsertARB (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "\0"
-   /* _mesa_function_pool[34843]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[34838]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34873]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[34868]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[34906]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[34901]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[34928]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[34923]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[34946]: Enable (offset 215) */
+   /* _mesa_function_pool[34941]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[34958]: LineStipple (offset 167) */
+   /* _mesa_function_pool[34953]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[34976]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[34971]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[35002]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[34997]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[35019]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[35014]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[35045]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[35040]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[35075]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[35070]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[35102]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35097]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35156]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[35151]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[35199]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[35194]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[35232]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[35227]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[35258]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[35253]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[35273]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[35268]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[35304]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[35299]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[35325]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35320]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35355]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[35350]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35395]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[35390]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[35432]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[35427]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[35456]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35451]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[35481]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[35476]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35502]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[35497]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -5136,687 +5133,686 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1758, AttachShader_remap_index },
-   { 10938, CreateProgram_remap_index },
-   { 24675, CreateShader_remap_index },
-   { 27375, DeleteProgram_remap_index },
-   { 20075, DeleteShader_remap_index },
-   { 25204, DetachShader_remap_index },
-   { 19361, GetAttachedShaders_remap_index },
-   {  5435, GetProgramInfoLog_remap_index },
+   {  1731, AttachShader_remap_index },
+   { 10911, CreateProgram_remap_index },
+   { 24658, CreateShader_remap_index },
+   { 27358, DeleteProgram_remap_index },
+   { 20058, DeleteShader_remap_index },
+   { 25187, DetachShader_remap_index },
+   { 19334, GetAttachedShaders_remap_index },
+   {  5408, GetProgramInfoLog_remap_index },
    {   453, GetProgramiv_remap_index },
-   {  7379, GetShaderInfoLog_remap_index },
-   { 33250, GetShaderiv_remap_index },
-   { 14448, IsProgram_remap_index },
-   { 13350, IsShader_remap_index },
-   { 11068, StencilFuncSeparate_remap_index },
-   {  4312, StencilMaskSeparate_remap_index },
-   {  8508, StencilOpSeparate_remap_index },
-   { 23870, UniformMatrix2x3fv_remap_index },
-   {  3181, UniformMatrix2x4fv_remap_index },
-   { 35075, UniformMatrix3x2fv_remap_index },
-   { 32575, UniformMatrix3x4fv_remap_index },
-   { 17481, UniformMatrix4x2fv_remap_index },
-   {  3620, UniformMatrix4x3fv_remap_index },
-   {  5658, ClampColor_remap_index },
-   { 19415, ClearBufferfi_remap_index },
-   { 18831, ClearBufferfv_remap_index },
-   { 31556, ClearBufferiv_remap_index },
-   { 14646, ClearBufferuiv_remap_index },
-   { 21412, GetStringi_remap_index },
-   { 19917, TexBuffer_remap_index },
+   {  7352, GetShaderInfoLog_remap_index },
+   { 33245, GetShaderiv_remap_index },
+   { 14421, IsProgram_remap_index },
+   { 13323, IsShader_remap_index },
+   { 11041, StencilFuncSeparate_remap_index },
+   {  4285, StencilMaskSeparate_remap_index },
+   {  8481, StencilOpSeparate_remap_index },
+   { 23853, UniformMatrix2x3fv_remap_index },
+   {  3154, UniformMatrix2x4fv_remap_index },
+   { 35070, UniformMatrix3x2fv_remap_index },
+   { 32570, UniformMatrix3x4fv_remap_index },
+   { 17454, UniformMatrix4x2fv_remap_index },
+   {  3593, UniformMatrix4x3fv_remap_index },
+   {  5631, ClampColor_remap_index },
+   { 19388, ClearBufferfi_remap_index },
+   { 18804, ClearBufferfv_remap_index },
+   { 31551, ClearBufferiv_remap_index },
+   { 14619, ClearBufferuiv_remap_index },
+   { 21395, GetStringi_remap_index },
    {   986, FramebufferTexture_remap_index },
-   { 28442, GetBufferParameteri64v_remap_index },
-   { 11168, GetInteger64i_v_remap_index },
-   { 25017, VertexAttribDivisor_remap_index },
-   { 10956, LoadTransposeMatrixdARB_remap_index },
-   { 32979, LoadTransposeMatrixfARB_remap_index },
-   {  6402, MultTransposeMatrixdARB_remap_index },
-   { 25391, MultTransposeMatrixfARB_remap_index },
+   { 28425, GetBufferParameteri64v_remap_index },
+   { 11141, GetInteger64i_v_remap_index },
+   { 25000, VertexAttribDivisor_remap_index },
+   { 10929, LoadTransposeMatrixdARB_remap_index },
+   { 32974, LoadTransposeMatrixfARB_remap_index },
+   {  6375, MultTransposeMatrixdARB_remap_index },
+   { 25374, MultTransposeMatrixfARB_remap_index },
    {   264, SampleCoverageARB_remap_index },
-   {  6586, CompressedTexImage1DARB_remap_index },
-   { 25919, CompressedTexImage2DARB_remap_index },
-   {  4375, CompressedTexImage3DARB_remap_index },
-   { 19666, CompressedTexSubImage1DARB_remap_index },
-   {  2326, CompressedTexSubImage2DARB_remap_index },
-   { 21834, CompressedTexSubImage3DARB_remap_index },
-   { 30620, GetCompressedTexImageARB_remap_index },
-   {  4186, DisableVertexAttribArrayARB_remap_index },
-   { 32140, EnableVertexAttribArrayARB_remap_index },
-   { 34093, GetProgramEnvParameterdvARB_remap_index },
-   { 25271, GetProgramEnvParameterfvARB_remap_index },
-   { 29490, GetProgramLocalParameterdvARB_remap_index },
-   {  8978, GetProgramLocalParameterfvARB_remap_index },
-   { 19823, GetProgramStringARB_remap_index },
-   { 29685, GetProgramivARB_remap_index },
-   { 22029, GetVertexAttribdvARB_remap_index },
-   { 17314, GetVertexAttribfvARB_remap_index },
-   { 10747, GetVertexAttribivARB_remap_index },
-   { 20867, ProgramEnvParameter4dARB_remap_index },
-   { 27084, ProgramEnvParameter4dvARB_remap_index },
-   { 18133, ProgramEnvParameter4fARB_remap_index },
-   {  9886, ProgramEnvParameter4fvARB_remap_index },
-   {  4338, ProgramLocalParameter4dARB_remap_index },
-   { 14158, ProgramLocalParameter4dvARB_remap_index },
-   { 31577, ProgramLocalParameter4fARB_remap_index },
-   { 27761, ProgramLocalParameter4fvARB_remap_index },
-   { 30327, ProgramStringARB_remap_index },
-   { 21160, VertexAttrib1dARB_remap_index },
-   { 16915, VertexAttrib1dvARB_remap_index },
-   {  4534, VertexAttrib1fARB_remap_index },
-   { 35156, VertexAttrib1fvARB_remap_index },
-   {  8009, VertexAttrib1sARB_remap_index },
-   {  2521, VertexAttrib1svARB_remap_index },
-   { 16328, VertexAttrib2dARB_remap_index },
-   { 18852, VertexAttrib2dvARB_remap_index },
-   {  1808, VertexAttrib2fARB_remap_index },
-   { 18965, VertexAttrib2fvARB_remap_index },
-   { 34700, VertexAttrib2sARB_remap_index },
-   { 33730, VertexAttrib2svARB_remap_index },
-   { 12342, VertexAttrib3dARB_remap_index },
-   {  9553, VertexAttrib3dvARB_remap_index },
-   {  1895, VertexAttrib3fARB_remap_index },
-   { 24226, VertexAttrib3fvARB_remap_index },
-   { 30174, VertexAttrib3sARB_remap_index },
-   { 21771, VertexAttrib3svARB_remap_index },
-   {  5478, VertexAttrib4NbvARB_remap_index },
-   { 19238, VertexAttrib4NivARB_remap_index },
-   { 24181, VertexAttrib4NsvARB_remap_index },
-   { 25223, VertexAttrib4NubARB_remap_index },
-   { 33976, VertexAttrib4NubvARB_remap_index },
-   { 20518, VertexAttrib4NuivARB_remap_index },
-   {  3493, VertexAttrib4NusvARB_remap_index },
-   { 11956, VertexAttrib4bvARB_remap_index },
-   { 28812, VertexAttrib4dARB_remap_index },
-   { 22801, VertexAttrib4dvARB_remap_index },
-   { 12496, VertexAttrib4fARB_remap_index },
-   { 12900, VertexAttrib4fvARB_remap_index },
-   { 11342, VertexAttrib4ivARB_remap_index },
-   { 18645, VertexAttrib4sARB_remap_index },
-   { 33165, VertexAttrib4svARB_remap_index },
-   { 17938, VertexAttrib4ubvARB_remap_index },
-   { 32464, VertexAttrib4uivARB_remap_index },
-   { 21582, VertexAttrib4usvARB_remap_index },
-   { 23686, VertexAttribPointerARB_remap_index },
-   { 34873, BindBufferARB_remap_index },
-   {  7716, BufferDataARB_remap_index },
-   {  1626, BufferSubDataARB_remap_index },
-   { 32750, DeleteBuffersARB_remap_index },
-   { 35199, GenBuffersARB_remap_index },
-   { 19008, GetBufferParameterivARB_remap_index },
-   { 18085, GetBufferPointervARB_remap_index },
-   {  1579, GetBufferSubDataARB_remap_index },
-   { 32412, IsBufferARB_remap_index },
-   { 28286, MapBufferARB_remap_index },
-   { 33380, UnmapBufferARB_remap_index },
+   {  6559, CompressedTexImage1DARB_remap_index },
+   { 25902, CompressedTexImage2DARB_remap_index },
+   {  4348, CompressedTexImage3DARB_remap_index },
+   { 19639, CompressedTexSubImage1DARB_remap_index },
+   {  2299, CompressedTexSubImage2DARB_remap_index },
+   { 21817, CompressedTexSubImage3DARB_remap_index },
+   { 30615, GetCompressedTexImageARB_remap_index },
+   {  4159, DisableVertexAttribArrayARB_remap_index },
+   { 32135, EnableVertexAttribArrayARB_remap_index },
+   { 34088, GetProgramEnvParameterdvARB_remap_index },
+   { 25254, GetProgramEnvParameterfvARB_remap_index },
+   { 29473, GetProgramLocalParameterdvARB_remap_index },
+   {  8951, GetProgramLocalParameterfvARB_remap_index },
+   { 19796, GetProgramStringARB_remap_index },
+   { 29668, GetProgramivARB_remap_index },
+   { 22012, GetVertexAttribdvARB_remap_index },
+   { 17287, GetVertexAttribfvARB_remap_index },
+   { 10720, GetVertexAttribivARB_remap_index },
+   { 20850, ProgramEnvParameter4dARB_remap_index },
+   { 27067, ProgramEnvParameter4dvARB_remap_index },
+   { 18106, ProgramEnvParameter4fARB_remap_index },
+   {  9859, ProgramEnvParameter4fvARB_remap_index },
+   {  4311, ProgramLocalParameter4dARB_remap_index },
+   { 14131, ProgramLocalParameter4dvARB_remap_index },
+   { 31572, ProgramLocalParameter4fARB_remap_index },
+   { 27744, ProgramLocalParameter4fvARB_remap_index },
+   { 30322, ProgramStringARB_remap_index },
+   { 21143, VertexAttrib1dARB_remap_index },
+   { 16888, VertexAttrib1dvARB_remap_index },
+   {  4507, VertexAttrib1fARB_remap_index },
+   { 35151, VertexAttrib1fvARB_remap_index },
+   {  7982, VertexAttrib1sARB_remap_index },
+   {  2494, VertexAttrib1svARB_remap_index },
+   { 16301, VertexAttrib2dARB_remap_index },
+   { 18825, VertexAttrib2dvARB_remap_index },
+   {  1781, VertexAttrib2fARB_remap_index },
+   { 18938, VertexAttrib2fvARB_remap_index },
+   { 34695, VertexAttrib2sARB_remap_index },
+   { 33725, VertexAttrib2svARB_remap_index },
+   { 12315, VertexAttrib3dARB_remap_index },
+   {  9526, VertexAttrib3dvARB_remap_index },
+   {  1868, VertexAttrib3fARB_remap_index },
+   { 24209, VertexAttrib3fvARB_remap_index },
+   { 30169, VertexAttrib3sARB_remap_index },
+   { 21754, VertexAttrib3svARB_remap_index },
+   {  5451, VertexAttrib4NbvARB_remap_index },
+   { 19211, VertexAttrib4NivARB_remap_index },
+   { 24164, VertexAttrib4NsvARB_remap_index },
+   { 25206, VertexAttrib4NubARB_remap_index },
+   { 33971, VertexAttrib4NubvARB_remap_index },
+   { 20501, VertexAttrib4NuivARB_remap_index },
+   {  3466, VertexAttrib4NusvARB_remap_index },
+   { 11929, VertexAttrib4bvARB_remap_index },
+   { 28795, VertexAttrib4dARB_remap_index },
+   { 22784, VertexAttrib4dvARB_remap_index },
+   { 12469, VertexAttrib4fARB_remap_index },
+   { 12873, VertexAttrib4fvARB_remap_index },
+   { 11315, VertexAttrib4ivARB_remap_index },
+   { 18618, VertexAttrib4sARB_remap_index },
+   { 33160, VertexAttrib4svARB_remap_index },
+   { 17911, VertexAttrib4ubvARB_remap_index },
+   { 32459, VertexAttrib4uivARB_remap_index },
+   { 21565, VertexAttrib4usvARB_remap_index },
+   { 23669, VertexAttribPointerARB_remap_index },
+   { 34868, BindBufferARB_remap_index },
+   {  7689, BufferDataARB_remap_index },
+   {  1599, BufferSubDataARB_remap_index },
+   { 32745, DeleteBuffersARB_remap_index },
+   { 35194, GenBuffersARB_remap_index },
+   { 18981, GetBufferParameterivARB_remap_index },
+   { 18058, GetBufferPointervARB_remap_index },
+   {  1552, GetBufferSubDataARB_remap_index },
+   { 32407, IsBufferARB_remap_index },
+   { 28269, MapBufferARB_remap_index },
+   { 33375, UnmapBufferARB_remap_index },
    {   360, BeginQueryARB_remap_index },
-   { 21238, DeleteQueriesARB_remap_index },
-   { 13211, EndQueryARB_remap_index },
-   { 31099, GenQueriesARB_remap_index },
-   {  2218, GetQueryObjectivARB_remap_index },
-   { 18689, GetQueryObjectuivARB_remap_index },
-   {  1997, GetQueryivARB_remap_index },
-   { 21489, IsQueryARB_remap_index },
-   {  9163, AttachObjectARB_remap_index },
-   { 20037, CompileShaderARB_remap_index },
-   {  3562, CreateProgramObjectARB_remap_index },
-   {  7661, CreateShaderObjectARB_remap_index },
-   { 15611, DeleteObjectARB_remap_index },
-   { 25710, DetachObjectARB_remap_index },
-   { 12964, GetActiveUniformARB_remap_index },
-   { 10389, GetAttachedObjectsARB_remap_index },
-   { 10696, GetHandleARB_remap_index },
-   { 34906, GetInfoLogARB_remap_index },
-   { 34047, GetObjectParameterfvARB_remap_index },
-   { 29364, GetObjectParameterivARB_remap_index },
-   { 30857, GetShaderSourceARB_remap_index },
-   { 30034, GetUniformLocationARB_remap_index },
-   { 25493, GetUniformfvARB_remap_index },
-   { 13733, GetUniformivARB_remap_index },
-   { 21627, LinkProgramARB_remap_index },
-   { 21685, ShaderSourceARB_remap_index },
-   {  8408, Uniform1fARB_remap_index },
-   { 31803, Uniform1fvARB_remap_index },
-   { 23634, Uniform1iARB_remap_index },
-   { 22439, Uniform1ivARB_remap_index },
-   {  2470, Uniform2fARB_remap_index },
-   { 15447, Uniform2fvARB_remap_index },
-   { 28153, Uniform2iARB_remap_index },
-   {  2590, Uniform2ivARB_remap_index },
-   { 20147, Uniform3fARB_remap_index },
-   { 10419, Uniform3fvARB_remap_index },
-   {  7190, Uniform3iARB_remap_index },
-   { 18191, Uniform3ivARB_remap_index },
-   { 20673, Uniform4fARB_remap_index },
-   { 25357, Uniform4fvARB_remap_index },
-   { 26694, Uniform4iARB_remap_index },
-   { 21995, Uniform4ivARB_remap_index },
-   {  9215, UniformMatrix2fvARB_remap_index },
+   { 21221, DeleteQueriesARB_remap_index },
+   { 13184, EndQueryARB_remap_index },
+   { 31094, GenQueriesARB_remap_index },
+   {  2191, GetQueryObjectivARB_remap_index },
+   { 18662, GetQueryObjectuivARB_remap_index },
+   {  1970, GetQueryivARB_remap_index },
+   { 21472, IsQueryARB_remap_index },
+   {  9136, AttachObjectARB_remap_index },
+   { 20020, CompileShaderARB_remap_index },
+   {  3535, CreateProgramObjectARB_remap_index },
+   {  7634, CreateShaderObjectARB_remap_index },
+   { 15584, DeleteObjectARB_remap_index },
+   { 25693, DetachObjectARB_remap_index },
+   { 12937, GetActiveUniformARB_remap_index },
+   { 10362, GetAttachedObjectsARB_remap_index },
+   { 10669, GetHandleARB_remap_index },
+   { 34901, GetInfoLogARB_remap_index },
+   { 34042, GetObjectParameterfvARB_remap_index },
+   { 29347, GetObjectParameterivARB_remap_index },
+   { 30852, GetShaderSourceARB_remap_index },
+   { 30029, GetUniformLocationARB_remap_index },
+   { 25476, GetUniformfvARB_remap_index },
+   { 13706, GetUniformivARB_remap_index },
+   { 21610, LinkProgramARB_remap_index },
+   { 21668, ShaderSourceARB_remap_index },
+   {  8381, Uniform1fARB_remap_index },
+   { 31798, Uniform1fvARB_remap_index },
+   { 23617, Uniform1iARB_remap_index },
+   { 22422, Uniform1ivARB_remap_index },
+   {  2443, Uniform2fARB_remap_index },
+   { 15420, Uniform2fvARB_remap_index },
+   { 28136, Uniform2iARB_remap_index },
+   {  2563, Uniform2ivARB_remap_index },
+   { 20130, Uniform3fARB_remap_index },
+   { 10392, Uniform3fvARB_remap_index },
+   {  7163, Uniform3iARB_remap_index },
+   { 18164, Uniform3ivARB_remap_index },
+   { 20656, Uniform4fARB_remap_index },
+   { 25340, Uniform4fvARB_remap_index },
+   { 26677, Uniform4iARB_remap_index },
+   { 21978, Uniform4ivARB_remap_index },
+   {  9188, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  3007, UniformMatrix4fvARB_remap_index },
-   { 27237, UseProgramObjectARB_remap_index },
-   { 16016, ValidateProgramARB_remap_index },
-   { 22844, BindAttribLocationARB_remap_index },
-   {  5523, GetActiveAttribARB_remap_index },
-   { 17872, GetAttribLocationARB_remap_index },
-   { 31488, DrawBuffersARB_remap_index },
-   { 31295, ClampColorARB_remap_index },
-   { 19283, DrawArraysInstancedARB_remap_index },
-   {  7251, DrawElementsInstancedARB_remap_index },
-   { 14263, RenderbufferStorageMultisample_remap_index },
-   { 14727, FramebufferTextureARB_remap_index },
-   { 27663, FramebufferTextureFaceARB_remap_index },
-   { 25859, ProgramParameteriARB_remap_index },
-   { 25175, VertexAttribDivisorARB_remap_index },
-   { 20721, FlushMappedBufferRange_remap_index },
-   { 29801, MapBufferRange_remap_index },
-   { 29708, TexBufferARB_remap_index },
-   { 17619, BindVertexArray_remap_index },
-   { 15820, GenVertexArrays_remap_index },
-   { 32342, CopyBufferSubData_remap_index },
-   { 33269, ClientWaitSync_remap_index },
-   {  2926, DeleteSync_remap_index },
-   {  8050, FenceSync_remap_index },
-   { 16387, GetInteger64v_remap_index },
-   { 24288, GetSynciv_remap_index },
-   { 31427, IsSync_remap_index },
-   { 10319, WaitSync_remap_index },
-   {  4154, DrawElementsBaseVertex_remap_index },
-   { 19875, DrawElementsInstancedBaseVertex_remap_index },
-   { 32654, DrawRangeElementsBaseVertex_remap_index },
-   { 28317, MultiDrawElementsBaseVertex_remap_index },
-   { 27157, BlendEquationSeparateiARB_remap_index },
-   { 19101, BlendEquationiARB_remap_index },
-   { 13672, BlendFuncSeparateiARB_remap_index },
-   { 10795, BlendFunciARB_remap_index },
-   {  5719, BindFragDataLocationIndexed_remap_index },
-   { 23202, GetFragDataIndex_remap_index },
-   {  9044, BindSampler_remap_index },
-   {  4513, DeleteSamplers_remap_index },
-   { 21094, GenSamplers_remap_index },
-   { 31333, GetSamplerParameterIiv_remap_index },
-   { 20615, GetSamplerParameterIuiv_remap_index },
-   {  5355, GetSamplerParameterfv_remap_index },
-   { 27394, GetSamplerParameteriv_remap_index },
-   { 15400, IsSampler_remap_index },
-   { 17572, SamplerParameterIiv_remap_index },
-   { 32693, SamplerParameterIuiv_remap_index },
-   { 23922, SamplerParameterf_remap_index },
-   { 17799, SamplerParameterfv_remap_index },
-   { 23897, SamplerParameteri_remap_index },
-   { 19477, SamplerParameteriv_remap_index },
-   { 15431, ColorP3ui_remap_index },
-   { 32916, ColorP3uiv_remap_index },
-   { 22545, ColorP4ui_remap_index },
-   { 14568, ColorP4uiv_remap_index },
-   { 10364, MultiTexCoordP1ui_remap_index },
-   { 13646, MultiTexCoordP1uiv_remap_index },
-   { 18583, MultiTexCoordP2ui_remap_index },
-   { 32114, MultiTexCoordP2uiv_remap_index },
-   { 15011, MultiTexCoordP3ui_remap_index },
-   { 11418, MultiTexCoordP3uiv_remap_index },
-   { 23487, MultiTexCoordP4ui_remap_index },
-   { 14757, MultiTexCoordP4uiv_remap_index },
-   { 31786, NormalP3ui_remap_index },
-   { 20369, NormalP3uiv_remap_index },
-   { 26599, SecondaryColorP3ui_remap_index },
-   { 20387, SecondaryColorP3uiv_remap_index },
+   {  2980, UniformMatrix4fvARB_remap_index },
+   { 27220, UseProgramObjectARB_remap_index },
+   { 15989, ValidateProgramARB_remap_index },
+   { 22827, BindAttribLocationARB_remap_index },
+   {  5496, GetActiveAttribARB_remap_index },
+   { 17845, GetAttribLocationARB_remap_index },
+   { 31483, DrawBuffersARB_remap_index },
+   { 31290, ClampColorARB_remap_index },
+   { 19256, DrawArraysInstancedARB_remap_index },
+   {  7224, DrawElementsInstancedARB_remap_index },
+   { 14236, RenderbufferStorageMultisample_remap_index },
+   { 14700, FramebufferTextureARB_remap_index },
+   { 27646, FramebufferTextureFaceARB_remap_index },
+   { 25842, ProgramParameteriARB_remap_index },
+   { 25158, VertexAttribDivisorARB_remap_index },
+   { 20704, FlushMappedBufferRange_remap_index },
+   { 29796, MapBufferRange_remap_index },
+   { 29691, TexBufferARB_remap_index },
+   { 17592, BindVertexArray_remap_index },
+   { 15793, GenVertexArrays_remap_index },
+   { 32337, CopyBufferSubData_remap_index },
+   { 33264, ClientWaitSync_remap_index },
+   {  2899, DeleteSync_remap_index },
+   {  8023, FenceSync_remap_index },
+   { 16360, GetInteger64v_remap_index },
+   { 24271, GetSynciv_remap_index },
+   { 31422, IsSync_remap_index },
+   { 10292, WaitSync_remap_index },
+   {  4127, DrawElementsBaseVertex_remap_index },
+   { 19848, DrawElementsInstancedBaseVertex_remap_index },
+   { 32649, DrawRangeElementsBaseVertex_remap_index },
+   { 28300, MultiDrawElementsBaseVertex_remap_index },
+   { 27140, BlendEquationSeparateiARB_remap_index },
+   { 19074, BlendEquationiARB_remap_index },
+   { 13645, BlendFuncSeparateiARB_remap_index },
+   { 10768, BlendFunciARB_remap_index },
+   {  5692, BindFragDataLocationIndexed_remap_index },
+   { 23185, GetFragDataIndex_remap_index },
+   {  9017, BindSampler_remap_index },
+   {  4486, DeleteSamplers_remap_index },
+   { 21077, GenSamplers_remap_index },
+   { 31328, GetSamplerParameterIiv_remap_index },
+   { 20598, GetSamplerParameterIuiv_remap_index },
+   {  5328, GetSamplerParameterfv_remap_index },
+   { 27377, GetSamplerParameteriv_remap_index },
+   { 15373, IsSampler_remap_index },
+   { 17545, SamplerParameterIiv_remap_index },
+   { 32688, SamplerParameterIuiv_remap_index },
+   { 23905, SamplerParameterf_remap_index },
+   { 17772, SamplerParameterfv_remap_index },
+   { 23880, SamplerParameteri_remap_index },
+   { 19450, SamplerParameteriv_remap_index },
+   { 15404, ColorP3ui_remap_index },
+   { 32911, ColorP3uiv_remap_index },
+   { 22528, ColorP4ui_remap_index },
+   { 14541, ColorP4uiv_remap_index },
+   { 10337, MultiTexCoordP1ui_remap_index },
+   { 13619, MultiTexCoordP1uiv_remap_index },
+   { 18556, MultiTexCoordP2ui_remap_index },
+   { 32109, MultiTexCoordP2uiv_remap_index },
+   { 14984, MultiTexCoordP3ui_remap_index },
+   { 11391, MultiTexCoordP3uiv_remap_index },
+   { 23470, MultiTexCoordP4ui_remap_index },
+   { 14730, MultiTexCoordP4uiv_remap_index },
+   { 31781, NormalP3ui_remap_index },
+   { 20352, NormalP3uiv_remap_index },
+   { 26582, SecondaryColorP3ui_remap_index },
+   { 20370, SecondaryColorP3uiv_remap_index },
    {  1013, TexCoordP1ui_remap_index },
-   {  2693, TexCoordP1uiv_remap_index },
-   { 15896, TexCoordP2ui_remap_index },
-   { 12021, TexCoordP2uiv_remap_index },
-   { 13605, TexCoordP3ui_remap_index },
-   { 22238, TexCoordP3uiv_remap_index },
-   {  2126, TexCoordP4ui_remap_index },
-   {  5986, TexCoordP4uiv_remap_index },
-   { 10838, VertexAttribP1ui_remap_index },
-   { 13014, VertexAttribP1uiv_remap_index },
-   {  8613, VertexAttribP2ui_remap_index },
-   { 30571, VertexAttribP2uiv_remap_index },
-   {  5052, VertexAttribP3ui_remap_index },
-   { 28226, VertexAttribP3uiv_remap_index },
-   { 15225, VertexAttribP4ui_remap_index },
-   { 17172, VertexAttribP4uiv_remap_index },
-   {  5461, VertexP2ui_remap_index },
-   { 16742, VertexP2uiv_remap_index },
-   {  3294, VertexP3ui_remap_index },
-   { 21201, VertexP3uiv_remap_index },
-   { 10347, VertexP4ui_remap_index },
-   { 34361, VertexP4uiv_remap_index },
-   {  5755, BindTransformFeedback_remap_index },
-   { 11218, DeleteTransformFeedbacks_remap_index },
-   {  7223, DrawTransformFeedback_remap_index },
-   { 10556, GenTransformFeedbacks_remap_index },
-   { 30217, IsTransformFeedback_remap_index },
-   {  1181, PauseTransformFeedback_remap_index },
-   {  6287, ResumeTransformFeedback_remap_index },
-   { 23185, ClearDepthf_remap_index },
-   {  7609, DepthRangef_remap_index },
-   { 15632, GetShaderPrecisionFormat_remap_index },
-   { 11008, ReleaseShaderCompiler_remap_index },
-   { 11999, ShaderBinary_remap_index },
-   {  1507, DebugMessageCallbackARB_remap_index },
-   { 10714, DebugMessageControlARB_remap_index },
-   { 34811, DebugMessageInsertARB_remap_index },
-   {  3105, GetDebugMessageLogARB_remap_index },
-   { 30515, GetGraphicsResetStatusARB_remap_index },
-   { 26474, GetnColorTableARB_remap_index },
-   {  8813, GetnCompressedTexImageARB_remap_index },
-   {  4246, GetnConvolutionFilterARB_remap_index },
-   { 16958, GetnHistogramARB_remap_index },
-   {  4955, GetnMapdvARB_remap_index },
-   { 23665, GetnMapfvARB_remap_index },
-   {  2449, GetnMapivARB_remap_index },
-   { 18453, GetnMinmaxARB_remap_index },
-   {  4930, GetnPixelMapfvARB_remap_index },
-   { 20492, GetnPixelMapuivARB_remap_index },
-   { 31401, GetnPixelMapusvARB_remap_index },
-   {  1429, GetnPolygonStippleARB_remap_index },
-   { 22629, GetnSeparableFilterARB_remap_index },
-   { 34742, GetnTexImageARB_remap_index },
-   { 19850, GetnUniformdvARB_remap_index },
-   {  8081, GetnUniformfvARB_remap_index },
-   { 10863, GetnUniformivARB_remap_index },
-   { 24137, GetnUniformuivARB_remap_index },
-   {  3208, ReadnPixelsARB_remap_index },
-   {  1316, TexStorage1D_remap_index },
-   {  4820, TexStorage2D_remap_index },
-   { 17425, TexStorage3D_remap_index },
-   {  4976, TextureStorage1DEXT_remap_index },
-   {  5783, TextureStorage2DEXT_remap_index },
-   {  1777, TextureStorage3DEXT_remap_index },
-   {  6155, PolygonOffsetEXT_remap_index },
-   { 24910, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4880, GetPixelTexGenParameterivSGIS_remap_index },
-   { 24643, PixelTexGenParameterfSGIS_remap_index },
+   {  2666, TexCoordP1uiv_remap_index },
+   { 15869, TexCoordP2ui_remap_index },
+   { 11994, TexCoordP2uiv_remap_index },
+   { 13578, TexCoordP3ui_remap_index },
+   { 22221, TexCoordP3uiv_remap_index },
+   {  2099, TexCoordP4ui_remap_index },
+   {  5959, TexCoordP4uiv_remap_index },
+   { 10811, VertexAttribP1ui_remap_index },
+   { 12987, VertexAttribP1uiv_remap_index },
+   {  8586, VertexAttribP2ui_remap_index },
+   { 30566, VertexAttribP2uiv_remap_index },
+   {  5025, VertexAttribP3ui_remap_index },
+   { 28209, VertexAttribP3uiv_remap_index },
+   { 15198, VertexAttribP4ui_remap_index },
+   { 17145, VertexAttribP4uiv_remap_index },
+   {  5434, VertexP2ui_remap_index },
+   { 16715, VertexP2uiv_remap_index },
+   {  3267, VertexP3ui_remap_index },
+   { 21184, VertexP3uiv_remap_index },
+   { 10320, VertexP4ui_remap_index },
+   { 34356, VertexP4uiv_remap_index },
+   {  5728, BindTransformFeedback_remap_index },
+   { 11191, DeleteTransformFeedbacks_remap_index },
+   {  7196, DrawTransformFeedback_remap_index },
+   { 10529, GenTransformFeedbacks_remap_index },
+   { 30212, IsTransformFeedback_remap_index },
+   { 19890, PauseTransformFeedback_remap_index },
+   {  6260, ResumeTransformFeedback_remap_index },
+   { 23168, ClearDepthf_remap_index },
+   {  7582, DepthRangef_remap_index },
+   { 15605, GetShaderPrecisionFormat_remap_index },
+   { 10981, ReleaseShaderCompiler_remap_index },
+   { 11972, ShaderBinary_remap_index },
+   {  1480, DebugMessageCallbackARB_remap_index },
+   { 10687, DebugMessageControlARB_remap_index },
+   { 34806, DebugMessageInsertARB_remap_index },
+   {  3078, GetDebugMessageLogARB_remap_index },
+   { 30510, GetGraphicsResetStatusARB_remap_index },
+   { 26457, GetnColorTableARB_remap_index },
+   {  8786, GetnCompressedTexImageARB_remap_index },
+   {  4219, GetnConvolutionFilterARB_remap_index },
+   { 16931, GetnHistogramARB_remap_index },
+   {  4928, GetnMapdvARB_remap_index },
+   { 23648, GetnMapfvARB_remap_index },
+   {  2422, GetnMapivARB_remap_index },
+   { 18426, GetnMinmaxARB_remap_index },
+   {  4903, GetnPixelMapfvARB_remap_index },
+   { 20475, GetnPixelMapuivARB_remap_index },
+   { 31396, GetnPixelMapusvARB_remap_index },
+   {  1402, GetnPolygonStippleARB_remap_index },
+   { 22612, GetnSeparableFilterARB_remap_index },
+   { 34737, GetnTexImageARB_remap_index },
+   { 19823, GetnUniformdvARB_remap_index },
+   {  8054, GetnUniformfvARB_remap_index },
+   { 10836, GetnUniformivARB_remap_index },
+   { 24120, GetnUniformuivARB_remap_index },
+   {  3181, ReadnPixelsARB_remap_index },
+   {  1289, TexStorage1D_remap_index },
+   {  4793, TexStorage2D_remap_index },
+   { 17398, TexStorage3D_remap_index },
+   {  4949, TextureStorage1DEXT_remap_index },
+   {  5756, TextureStorage2DEXT_remap_index },
+   {  1750, TextureStorage3DEXT_remap_index },
+   {  6128, PolygonOffsetEXT_remap_index },
+   { 24893, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4853, GetPixelTexGenParameterivSGIS_remap_index },
+   { 24626, PixelTexGenParameterfSGIS_remap_index },
    {   672, PixelTexGenParameterfvSGIS_remap_index },
-   { 13771, PixelTexGenParameteriSGIS_remap_index },
-   { 14910, PixelTexGenParameterivSGIS_remap_index },
-   { 17742, SampleMaskSGIS_remap_index },
-   { 21429, SamplePatternSGIS_remap_index },
-   { 21112, ColorPointerEXT_remap_index },
-   { 18895, EdgeFlagPointerEXT_remap_index },
-   {  6844, IndexPointerEXT_remap_index },
-   {  6924, NormalPointerEXT_remap_index },
-   { 17026, TexCoordPointerEXT_remap_index },
-   {  7839, VertexPointerEXT_remap_index },
-   {  3956, PointParameterfEXT_remap_index },
-   {  8709, PointParameterfvEXT_remap_index },
-   { 34145, LockArraysEXT_remap_index },
-   { 16080, UnlockArraysEXT_remap_index },
-   {  1337, SecondaryColor3bEXT_remap_index },
-   {  8902, SecondaryColor3bvEXT_remap_index },
-   { 11545, SecondaryColor3dEXT_remap_index },
-   { 27443, SecondaryColor3dvEXT_remap_index },
-   { 30083, SecondaryColor3fEXT_remap_index },
-   { 19602, SecondaryColor3fvEXT_remap_index },
+   { 13744, PixelTexGenParameteriSGIS_remap_index },
+   { 14883, PixelTexGenParameterivSGIS_remap_index },
+   { 17715, SampleMaskSGIS_remap_index },
+   { 21412, SamplePatternSGIS_remap_index },
+   { 21095, ColorPointerEXT_remap_index },
+   { 18868, EdgeFlagPointerEXT_remap_index },
+   {  6817, IndexPointerEXT_remap_index },
+   {  6897, NormalPointerEXT_remap_index },
+   { 16999, TexCoordPointerEXT_remap_index },
+   {  7812, VertexPointerEXT_remap_index },
+   {  3929, PointParameterfEXT_remap_index },
+   {  8682, PointParameterfvEXT_remap_index },
+   { 34140, LockArraysEXT_remap_index },
+   { 16053, UnlockArraysEXT_remap_index },
+   {  1310, SecondaryColor3bEXT_remap_index },
+   {  8875, SecondaryColor3bvEXT_remap_index },
+   { 11518, SecondaryColor3dEXT_remap_index },
+   { 27426, SecondaryColor3dvEXT_remap_index },
+   { 30078, SecondaryColor3fEXT_remap_index },
+   { 19575, SecondaryColor3fvEXT_remap_index },
    {   518, SecondaryColor3iEXT_remap_index },
-   { 17362, SecondaryColor3ivEXT_remap_index },
-   { 11096, SecondaryColor3sEXT_remap_index },
-   { 32933, SecondaryColor3svEXT_remap_index },
-   { 29200, SecondaryColor3ubEXT_remap_index },
-   { 22735, SecondaryColor3ubvEXT_remap_index },
-   { 14013, SecondaryColor3uiEXT_remap_index },
-   { 24530, SecondaryColor3uivEXT_remap_index },
-   { 27713, SecondaryColor3usEXT_remap_index },
-   { 14086, SecondaryColor3usvEXT_remap_index },
-   { 12843, SecondaryColorPointerEXT_remap_index },
-   { 27527, MultiDrawArraysEXT_remap_index },
-   { 22374, MultiDrawElementsEXT_remap_index },
-   { 22585, FogCoordPointerEXT_remap_index },
-   {  5103, FogCoorddEXT_remap_index },
-   { 33546, FogCoorddvEXT_remap_index },
-   {  5220, FogCoordfEXT_remap_index },
-   { 29123, FogCoordfvEXT_remap_index },
-   { 12943, PixelTexGenSGIX_remap_index },
-   { 29728, BlendFuncSeparateEXT_remap_index },
-   {  7751, FlushVertexArrayRangeNV_remap_index },
-   {  6104, VertexArrayRangeNV_remap_index },
-   { 30148, CombinerInputNV_remap_index },
-   {  2392, CombinerOutputNV_remap_index },
-   { 33086, CombinerParameterfNV_remap_index },
-   {  5958, CombinerParameterfvNV_remap_index },
-   { 23947, CombinerParameteriNV_remap_index },
-   { 34542, CombinerParameterivNV_remap_index },
-   {  8152, FinalCombinerInputNV_remap_index },
-   {  7404, GetCombinerInputParameterfvNV_remap_index },
-   { 34379, GetCombinerInputParameterivNV_remap_index },
-   { 27856, GetCombinerOutputParameterfvNV_remap_index },
-   { 14839, GetCombinerOutputParameterivNV_remap_index },
-   {  7513, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 26541, GetFinalCombinerInputParameterivNV_remap_index },
-   { 13624, ResizeBuffersMESA_remap_index },
-   { 12169, WindowPos2dMESA_remap_index },
+   { 17335, SecondaryColor3ivEXT_remap_index },
+   { 11069, SecondaryColor3sEXT_remap_index },
+   { 32928, SecondaryColor3svEXT_remap_index },
+   { 29183, SecondaryColor3ubEXT_remap_index },
+   { 22718, SecondaryColor3ubvEXT_remap_index },
+   { 13986, SecondaryColor3uiEXT_remap_index },
+   { 24513, SecondaryColor3uivEXT_remap_index },
+   { 27696, SecondaryColor3usEXT_remap_index },
+   { 14059, SecondaryColor3usvEXT_remap_index },
+   { 12816, SecondaryColorPointerEXT_remap_index },
+   { 27510, MultiDrawArraysEXT_remap_index },
+   { 22357, MultiDrawElementsEXT_remap_index },
+   { 22568, FogCoordPointerEXT_remap_index },
+   {  5076, FogCoorddEXT_remap_index },
+   { 33541, FogCoorddvEXT_remap_index },
+   {  5193, FogCoordfEXT_remap_index },
+   { 29106, FogCoordfvEXT_remap_index },
+   { 12916, PixelTexGenSGIX_remap_index },
+   { 29723, BlendFuncSeparateEXT_remap_index },
+   {  7724, FlushVertexArrayRangeNV_remap_index },
+   {  6077, VertexArrayRangeNV_remap_index },
+   { 30143, CombinerInputNV_remap_index },
+   {  2365, CombinerOutputNV_remap_index },
+   { 33081, CombinerParameterfNV_remap_index },
+   {  5931, CombinerParameterfvNV_remap_index },
+   { 23930, CombinerParameteriNV_remap_index },
+   { 34537, CombinerParameterivNV_remap_index },
+   {  8125, FinalCombinerInputNV_remap_index },
+   {  7377, GetCombinerInputParameterfvNV_remap_index },
+   { 34374, GetCombinerInputParameterivNV_remap_index },
+   { 27839, GetCombinerOutputParameterfvNV_remap_index },
+   { 14812, GetCombinerOutputParameterivNV_remap_index },
+   {  7486, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 26524, GetFinalCombinerInputParameterivNV_remap_index },
+   { 13597, ResizeBuffersMESA_remap_index },
+   { 12142, WindowPos2dMESA_remap_index },
    {  1082, WindowPos2dvMESA_remap_index },
-   { 35502, WindowPos2fMESA_remap_index },
-   {  8847, WindowPos2fvMESA_remap_index },
-   { 19549, WindowPos2iMESA_remap_index },
-   { 21902, WindowPos2ivMESA_remap_index },
-   { 22473, WindowPos2sMESA_remap_index },
-   {  6500, WindowPos2svMESA_remap_index },
-   {  8638, WindowPos3dMESA_remap_index },
-   { 15170, WindowPos3dvMESA_remap_index },
+   { 35497, WindowPos2fMESA_remap_index },
+   {  8820, WindowPos2fvMESA_remap_index },
+   { 19522, WindowPos2iMESA_remap_index },
+   { 21885, WindowPos2ivMESA_remap_index },
+   { 22456, WindowPos2sMESA_remap_index },
+   {  6473, WindowPos2svMESA_remap_index },
+   {  8611, WindowPos3dMESA_remap_index },
+   { 15143, WindowPos3dvMESA_remap_index },
    {   564, WindowPos3fMESA_remap_index },
-   { 16141, WindowPos3fvMESA_remap_index },
-   { 25752, WindowPos3iMESA_remap_index },
-   { 32287, WindowPos3ivMESA_remap_index },
-   { 20291, WindowPos3sMESA_remap_index },
-   { 33802, WindowPos3svMESA_remap_index },
-   { 12120, WindowPos4dMESA_remap_index },
-   { 18329, WindowPos4dvMESA_remap_index },
-   { 15129, WindowPos4fMESA_remap_index },
-   { 32823, WindowPos4fvMESA_remap_index },
-   { 32440, WindowPos4iMESA_remap_index },
-   { 13464, WindowPos4ivMESA_remap_index },
-   { 20468, WindowPos4sMESA_remap_index },
-   {  3540, WindowPos4svMESA_remap_index },
-   { 14878, MultiModeDrawArraysIBM_remap_index },
-   { 30970, MultiModeDrawElementsIBM_remap_index },
-   { 13239, DeleteFencesNV_remap_index },
-   { 29995, FinishFenceNV_remap_index },
-   {  4078, GenFencesNV_remap_index },
-   { 18309, GetFenceivNV_remap_index },
-   {  9115, IsFenceNV_remap_index },
-   { 35002, SetFenceNV_remap_index },
-   {  4590, TestFenceNV_remap_index },
-   { 33773, AreProgramsResidentNV_remap_index },
-   { 33128, BindProgramNV_remap_index },
-   { 27796, DeleteProgramsNV_remap_index },
-   { 22953, ExecuteProgramNV_remap_index },
-   { 35395, GenProgramsNV_remap_index },
-   { 25043, GetProgramParameterdvNV_remap_index },
-   { 11607, GetProgramParameterfvNV_remap_index },
-   { 28200, GetProgramStringNV_remap_index },
-   { 26129, GetProgramivNV_remap_index },
-   { 25306, GetTrackMatrixivNV_remap_index },
-   { 27985, GetVertexAttribPointervNV_remap_index },
-   { 11191, GetVertexAttribdvNV_remap_index },
-   { 20264, GetVertexAttribfvNV_remap_index },
-   { 19796, GetVertexAttribivNV_remap_index },
-   { 20751, IsProgramNV_remap_index },
-   { 10297, LoadProgramNV_remap_index },
-   { 29824, ProgramParameters4dvNV_remap_index },
-   { 26059, ProgramParameters4fvNV_remap_index },
-   { 22206, RequestResidentProgramsNV_remap_index },
-   { 32632, TrackMatrixNV_remap_index },
-   { 27489, VertexAttrib1dNV_remap_index },
-   { 14668, VertexAttrib1dvNV_remap_index },
-   { 30423, VertexAttrib1fNV_remap_index },
-   {  2732, VertexAttrib1fvNV_remap_index },
-   { 32880, VertexAttrib1sNV_remap_index },
-   { 16214, VertexAttrib1svNV_remap_index },
-   {  5411, VertexAttrib2dNV_remap_index },
-   { 19730, VertexAttrib2dvNV_remap_index },
-   { 21661, VertexAttrib2fNV_remap_index },
-   { 14134, VertexAttrib2fvNV_remap_index },
-   {  6712, VertexAttrib2sNV_remap_index },
-   { 20345, VertexAttrib2svNV_remap_index },
-   { 12317, VertexAttrib3dNV_remap_index },
-   { 34023, VertexAttrib3dvNV_remap_index },
-   { 11393, VertexAttrib3fNV_remap_index },
-   { 26501, VertexAttrib3fvNV_remap_index },
-   { 30398, VertexAttrib3sNV_remap_index },
-   { 25333, VertexAttrib3svNV_remap_index },
-   { 30944, VertexAttrib4dNV_remap_index },
-   { 35432, VertexAttrib4dvNV_remap_index },
-   {  5826, VertexAttrib4fNV_remap_index },
-   { 26896, VertexAttrib4fvNV_remap_index },
-   { 28696, VertexAttrib4sNV_remap_index },
-   {  1537, VertexAttrib4svNV_remap_index },
-   {  5586, VertexAttrib4ubNV_remap_index },
+   { 16114, WindowPos3fvMESA_remap_index },
+   { 25735, WindowPos3iMESA_remap_index },
+   { 32282, WindowPos3ivMESA_remap_index },
+   { 20274, WindowPos3sMESA_remap_index },
+   { 33797, WindowPos3svMESA_remap_index },
+   { 12093, WindowPos4dMESA_remap_index },
+   { 18302, WindowPos4dvMESA_remap_index },
+   { 15102, WindowPos4fMESA_remap_index },
+   { 32818, WindowPos4fvMESA_remap_index },
+   { 32435, WindowPos4iMESA_remap_index },
+   { 13437, WindowPos4ivMESA_remap_index },
+   { 20451, WindowPos4sMESA_remap_index },
+   {  3513, WindowPos4svMESA_remap_index },
+   { 14851, MultiModeDrawArraysIBM_remap_index },
+   { 30965, MultiModeDrawElementsIBM_remap_index },
+   { 13212, DeleteFencesNV_remap_index },
+   { 29990, FinishFenceNV_remap_index },
+   {  4051, GenFencesNV_remap_index },
+   { 18282, GetFenceivNV_remap_index },
+   {  9088, IsFenceNV_remap_index },
+   { 34997, SetFenceNV_remap_index },
+   {  4563, TestFenceNV_remap_index },
+   { 33768, AreProgramsResidentNV_remap_index },
+   { 33123, BindProgramNV_remap_index },
+   { 27779, DeleteProgramsNV_remap_index },
+   { 22936, ExecuteProgramNV_remap_index },
+   { 35390, GenProgramsNV_remap_index },
+   { 25026, GetProgramParameterdvNV_remap_index },
+   { 11580, GetProgramParameterfvNV_remap_index },
+   { 28183, GetProgramStringNV_remap_index },
+   { 26112, GetProgramivNV_remap_index },
+   { 25289, GetTrackMatrixivNV_remap_index },
+   { 27968, GetVertexAttribPointervNV_remap_index },
+   { 11164, GetVertexAttribdvNV_remap_index },
+   { 20247, GetVertexAttribfvNV_remap_index },
+   { 19769, GetVertexAttribivNV_remap_index },
+   { 20734, IsProgramNV_remap_index },
+   { 10270, LoadProgramNV_remap_index },
+   { 29819, ProgramParameters4dvNV_remap_index },
+   { 26042, ProgramParameters4fvNV_remap_index },
+   { 22189, RequestResidentProgramsNV_remap_index },
+   { 32627, TrackMatrixNV_remap_index },
+   { 27472, VertexAttrib1dNV_remap_index },
+   { 14641, VertexAttrib1dvNV_remap_index },
+   { 30418, VertexAttrib1fNV_remap_index },
+   {  2705, VertexAttrib1fvNV_remap_index },
+   { 32875, VertexAttrib1sNV_remap_index },
+   { 16187, VertexAttrib1svNV_remap_index },
+   {  5384, VertexAttrib2dNV_remap_index },
+   { 19703, VertexAttrib2dvNV_remap_index },
+   { 21644, VertexAttrib2fNV_remap_index },
+   { 14107, VertexAttrib2fvNV_remap_index },
+   {  6685, VertexAttrib2sNV_remap_index },
+   { 20328, VertexAttrib2svNV_remap_index },
+   { 12290, VertexAttrib3dNV_remap_index },
+   { 34018, VertexAttrib3dvNV_remap_index },
+   { 11366, VertexAttrib3fNV_remap_index },
+   { 26484, VertexAttrib3fvNV_remap_index },
+   { 30393, VertexAttrib3sNV_remap_index },
+   { 25316, VertexAttrib3svNV_remap_index },
+   { 30939, VertexAttrib4dNV_remap_index },
+   { 35427, VertexAttrib4dvNV_remap_index },
+   {  5799, VertexAttrib4fNV_remap_index },
+   { 26879, VertexAttrib4fvNV_remap_index },
+   { 28679, VertexAttrib4sNV_remap_index },
+   {  1510, VertexAttrib4svNV_remap_index },
+   {  5559, VertexAttrib4ubNV_remap_index },
    {   826, VertexAttrib4ubvNV_remap_index },
-   { 23154, VertexAttribPointerNV_remap_index },
-   {  2564, VertexAttribs1dvNV_remap_index },
-   { 20413, VertexAttribs1fvNV_remap_index },
-   { 35232, VertexAttribs1svNV_remap_index },
-   { 11444, VertexAttribs2dvNV_remap_index },
-   { 31937, VertexAttribs2fvNV_remap_index },
-   { 18921, VertexAttribs2svNV_remap_index },
-   {  6006, VertexAttribs3dvNV_remap_index },
-   {  2423, VertexAttribs3fvNV_remap_index },
-   { 32009, VertexAttribs3svNV_remap_index },
-   { 28786, VertexAttribs4dvNV_remap_index },
-   {  6078, VertexAttribs4fvNV_remap_index },
-   { 35019, VertexAttribs4svNV_remap_index },
-   { 31741, VertexAttribs4ubvNV_remap_index },
-   { 28856, GetTexBumpParameterfvATI_remap_index },
-   { 35273, GetTexBumpParameterivATI_remap_index },
-   { 19990, TexBumpParameterfvATI_remap_index },
-   { 22077, TexBumpParameterivATI_remap_index },
-   { 16778, AlphaFragmentOp1ATI_remap_index },
-   {  9130, AlphaFragmentOp2ATI_remap_index },
-   { 26417, AlphaFragmentOp3ATI_remap_index },
-   { 15102, BeginFragmentShaderATI_remap_index },
-   { 33327, BindFragmentShaderATI_remap_index },
-   { 25462, ColorFragmentOp1ATI_remap_index },
-   {  4786, ColorFragmentOp2ATI_remap_index },
-   { 33668, ColorFragmentOp3ATI_remap_index },
-   {  6244, DeleteFragmentShaderATI_remap_index },
-   { 35456, EndFragmentShaderATI_remap_index },
-   { 34570, GenFragmentShadersATI_remap_index },
-   { 27352, PassTexCoordATI_remap_index },
-   {  7819, SampleMapATI_remap_index },
-   { 29018, SetFragmentShaderConstantATI_remap_index },
+   { 23137, VertexAttribPointerNV_remap_index },
+   {  2537, VertexAttribs1dvNV_remap_index },
+   { 20396, VertexAttribs1fvNV_remap_index },
+   { 35227, VertexAttribs1svNV_remap_index },
+   { 11417, VertexAttribs2dvNV_remap_index },
+   { 31932, VertexAttribs2fvNV_remap_index },
+   { 18894, VertexAttribs2svNV_remap_index },
+   {  5979, VertexAttribs3dvNV_remap_index },
+   {  2396, VertexAttribs3fvNV_remap_index },
+   { 32004, VertexAttribs3svNV_remap_index },
+   { 28769, VertexAttribs4dvNV_remap_index },
+   {  6051, VertexAttribs4fvNV_remap_index },
+   { 35014, VertexAttribs4svNV_remap_index },
+   { 31736, VertexAttribs4ubvNV_remap_index },
+   { 28839, GetTexBumpParameterfvATI_remap_index },
+   { 35268, GetTexBumpParameterivATI_remap_index },
+   { 19973, TexBumpParameterfvATI_remap_index },
+   { 22060, TexBumpParameterivATI_remap_index },
+   { 16751, AlphaFragmentOp1ATI_remap_index },
+   {  9103, AlphaFragmentOp2ATI_remap_index },
+   { 26400, AlphaFragmentOp3ATI_remap_index },
+   { 15075, BeginFragmentShaderATI_remap_index },
+   { 33322, BindFragmentShaderATI_remap_index },
+   { 25445, ColorFragmentOp1ATI_remap_index },
+   {  4759, ColorFragmentOp2ATI_remap_index },
+   { 33663, ColorFragmentOp3ATI_remap_index },
+   {  6217, DeleteFragmentShaderATI_remap_index },
+   { 35451, EndFragmentShaderATI_remap_index },
+   { 34565, GenFragmentShadersATI_remap_index },
+   { 27335, PassTexCoordATI_remap_index },
+   {  7792, SampleMapATI_remap_index },
+   { 29001, SetFragmentShaderConstantATI_remap_index },
    {   411, PointParameteriNV_remap_index },
-   { 15356, PointParameterivNV_remap_index },
-   { 30783, ActiveStencilFaceEXT_remap_index },
-   { 29464, BindVertexArrayAPPLE_remap_index },
-   {  3054, DeleteVertexArraysAPPLE_remap_index },
-   { 19388, GenVertexArraysAPPLE_remap_index },
-   { 25108, IsVertexArrayAPPLE_remap_index },
+   { 15329, PointParameterivNV_remap_index },
+   { 30778, ActiveStencilFaceEXT_remap_index },
+   { 29447, BindVertexArrayAPPLE_remap_index },
+   {  3027, DeleteVertexArraysAPPLE_remap_index },
+   { 19361, GenVertexArraysAPPLE_remap_index },
+   { 25091, IsVertexArrayAPPLE_remap_index },
    {   867, GetProgramNamedParameterdvNV_remap_index },
-   {  3919, GetProgramNamedParameterfvNV_remap_index },
-   { 28887, ProgramNamedParameter4dNV_remap_index },
-   { 15695, ProgramNamedParameter4dvNV_remap_index },
-   {  9820, ProgramNamedParameter4fNV_remap_index },
-   { 12808, ProgramNamedParameter4fvNV_remap_index },
-   { 18240, PrimitiveRestartIndexNV_remap_index },
-   { 30597, PrimitiveRestartNV_remap_index },
-   { 26038, DepthBoundsEXT_remap_index },
-   {  1208, BlendEquationSeparateEXT_remap_index },
-   { 15915, BindFramebufferEXT_remap_index },
-   { 27572, BindRenderbufferEXT_remap_index },
-   { 10612, CheckFramebufferStatusEXT_remap_index },
-   { 24331, DeleteFramebuffersEXT_remap_index },
-   { 33925, DeleteRenderbuffersEXT_remap_index },
-   { 14585, FramebufferRenderbufferEXT_remap_index },
-   { 14783, FramebufferTexture1DEXT_remap_index },
-   { 12602, FramebufferTexture2DEXT_remap_index },
-   { 12222, FramebufferTexture3DEXT_remap_index },
-   { 24946, GenFramebuffersEXT_remap_index },
-   { 18786, GenRenderbuffersEXT_remap_index },
-   {  7555, GenerateMipmapEXT_remap_index },
-   { 23270, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 34476, GetRenderbufferParameterivEXT_remap_index },
-   { 21957, IsFramebufferEXT_remap_index },
-   { 35355, IsRenderbufferEXT_remap_index },
-   {  9062, RenderbufferStorageEXT_remap_index },
+   {  3892, GetProgramNamedParameterfvNV_remap_index },
+   { 28870, ProgramNamedParameter4dNV_remap_index },
+   { 15668, ProgramNamedParameter4dvNV_remap_index },
+   {  9793, ProgramNamedParameter4fNV_remap_index },
+   { 12781, ProgramNamedParameter4fvNV_remap_index },
+   { 18213, PrimitiveRestartIndexNV_remap_index },
+   { 30592, PrimitiveRestartNV_remap_index },
+   { 26021, DepthBoundsEXT_remap_index },
+   {  1181, BlendEquationSeparateEXT_remap_index },
+   { 15888, BindFramebufferEXT_remap_index },
+   { 27555, BindRenderbufferEXT_remap_index },
+   { 10585, CheckFramebufferStatusEXT_remap_index },
+   { 24314, DeleteFramebuffersEXT_remap_index },
+   { 33920, DeleteRenderbuffersEXT_remap_index },
+   { 14558, FramebufferRenderbufferEXT_remap_index },
+   { 14756, FramebufferTexture1DEXT_remap_index },
+   { 12575, FramebufferTexture2DEXT_remap_index },
+   { 12195, FramebufferTexture3DEXT_remap_index },
+   { 24929, GenFramebuffersEXT_remap_index },
+   { 18759, GenRenderbuffersEXT_remap_index },
+   {  7528, GenerateMipmapEXT_remap_index },
+   { 23253, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 34471, GetRenderbufferParameterivEXT_remap_index },
+   { 21940, IsFramebufferEXT_remap_index },
+   { 35350, IsRenderbufferEXT_remap_index },
+   {  9035, RenderbufferStorageEXT_remap_index },
    {   743, BlitFramebufferEXT_remap_index },
-   { 15481, BufferParameteriAPPLE_remap_index },
-   { 20783, FlushMappedBufferRangeAPPLE_remap_index },
-   {  2072, BindFragDataLocationEXT_remap_index },
-   { 10246, GetFragDataLocationEXT_remap_index },
-   { 11722, GetUniformuivEXT_remap_index },
-   { 34650, GetVertexAttribIivEXT_remap_index },
-   {  4607, GetVertexAttribIuivEXT_remap_index },
-   { 13072, Uniform1uiEXT_remap_index },
-   { 29909, Uniform1uivEXT_remap_index },
-   { 23812, Uniform2uiEXT_remap_index },
-   {  4750, Uniform2uivEXT_remap_index },
-   { 31223, Uniform3uiEXT_remap_index },
-   { 15842, Uniform3uivEXT_remap_index },
-   {  3843, Uniform4uiEXT_remap_index },
-   {  9596, Uniform4uivEXT_remap_index },
-   {  7336, VertexAttribI1iEXT_remap_index },
-   {  5613, VertexAttribI1ivEXT_remap_index },
-   {  2833, VertexAttribI1uiEXT_remap_index },
-   { 13862, VertexAttribI1uivEXT_remap_index },
+   { 15454, BufferParameteriAPPLE_remap_index },
+   { 20766, FlushMappedBufferRangeAPPLE_remap_index },
+   {  2045, BindFragDataLocationEXT_remap_index },
+   { 10219, GetFragDataLocationEXT_remap_index },
+   { 11695, GetUniformuivEXT_remap_index },
+   { 34645, GetVertexAttribIivEXT_remap_index },
+   {  4580, GetVertexAttribIuivEXT_remap_index },
+   { 13045, Uniform1uiEXT_remap_index },
+   { 29904, Uniform1uivEXT_remap_index },
+   { 23795, Uniform2uiEXT_remap_index },
+   {  4723, Uniform2uivEXT_remap_index },
+   { 31218, Uniform3uiEXT_remap_index },
+   { 15815, Uniform3uivEXT_remap_index },
+   {  3816, Uniform4uiEXT_remap_index },
+   {  9569, Uniform4uivEXT_remap_index },
+   {  7309, VertexAttribI1iEXT_remap_index },
+   {  5586, VertexAttribI1ivEXT_remap_index },
+   {  2806, VertexAttribI1uiEXT_remap_index },
+   { 13835, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 25574, VertexAttribI2ivEXT_remap_index },
-   {  6032, VertexAttribI2uiEXT_remap_index },
-   {  5265, VertexAttribI2uivEXT_remap_index },
-   { 28488, VertexAttribI3iEXT_remap_index },
-   { 26851, VertexAttribI3ivEXT_remap_index },
-   {  3697, VertexAttribI3uiEXT_remap_index },
-   { 32528, VertexAttribI3uivEXT_remap_index },
-   { 23546, VertexAttribI4bvEXT_remap_index },
-   { 15774, VertexAttribI4iEXT_remap_index },
-   {  1938, VertexAttribI4ivEXT_remap_index },
-   { 14495, VertexAttribI4svEXT_remap_index },
-   { 17825, VertexAttribI4ubvEXT_remap_index },
+   { 25557, VertexAttribI2ivEXT_remap_index },
+   {  6005, VertexAttribI2uiEXT_remap_index },
+   {  5238, VertexAttribI2uivEXT_remap_index },
+   { 28471, VertexAttribI3iEXT_remap_index },
+   { 26834, VertexAttribI3ivEXT_remap_index },
+   {  3670, VertexAttribI3uiEXT_remap_index },
+   { 32523, VertexAttribI3uivEXT_remap_index },
+   { 23529, VertexAttribI4bvEXT_remap_index },
+   { 15747, VertexAttribI4iEXT_remap_index },
+   {  1911, VertexAttribI4ivEXT_remap_index },
+   { 14468, VertexAttribI4svEXT_remap_index },
+   { 17798, VertexAttribI4ubvEXT_remap_index },
    {   145, VertexAttribI4uiEXT_remap_index },
-   {  6178, VertexAttribI4uivEXT_remap_index },
-   { 12385, VertexAttribI4usvEXT_remap_index },
-   { 19934, VertexAttribIPointerEXT_remap_index },
-   {  3355, FramebufferTextureLayerEXT_remap_index },
-   { 10204, ColorMaskIndexedEXT_remap_index },
-   { 28073, DisableIndexedEXT_remap_index },
-   { 28533, EnableIndexedEXT_remap_index },
-   { 23225, GetBooleanIndexedvEXT_remap_index },
-   { 26151, GetIntegerIndexedvEXT_remap_index },
-   { 24407, IsEnabledIndexedEXT_remap_index },
-   { 24307, ClearColorIiEXT_remap_index },
-   {  3793, ClearColorIuiEXT_remap_index },
-   { 10888, GetTexParameterIivEXT_remap_index },
-   {  6660, GetTexParameterIuivEXT_remap_index },
-   {  3311, TexParameterIivEXT_remap_index },
-   { 28355, TexParameterIuivEXT_remap_index },
-   {  5133, BeginConditionalRenderNV_remap_index },
-   { 27302, EndConditionalRenderNV_remap_index },
-   { 26196, BeginTransformFeedbackEXT_remap_index },
-   {  6736, BindBufferBaseEXT_remap_index },
-   { 24989, BindBufferOffsetEXT_remap_index },
-   { 13289, BindBufferRangeEXT_remap_index },
-   { 28967, EndTransformFeedbackEXT_remap_index },
-   {  5852, GetTransformFeedbackVaryingEXT_remap_index },
-   { 24003, TransformFeedbackVaryingsEXT_remap_index },
-   { 31642, ProvokingVertexEXT_remap_index },
-   { 11868, GetTexParameterPointervAPPLE_remap_index },
-   {  5675, TextureRangeAPPLE_remap_index },
-   { 12674, GetObjectParameterivAPPLE_remap_index },
-   { 21384, ObjectPurgeableAPPLE_remap_index },
-   {  6454, ObjectUnpurgeableAPPLE_remap_index },
-   { 18608, ActiveProgramEXT_remap_index },
-   {  4659, CreateShaderProgramEXT_remap_index },
-   { 30545, UseShaderProgramEXT_remap_index },
-   { 23027, TextureBarrierNV_remap_index },
-   { 30809, StencilFuncSeparateATI_remap_index },
-   {  6367, ProgramEnvParameters4fvEXT_remap_index },
-   { 18477, ProgramLocalParameters4fvEXT_remap_index },
-   { 15284, GetQueryObjecti64vEXT_remap_index },
-   { 11470, GetQueryObjectui64vEXT_remap_index },
-   { 25531, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 13178, EGLImageTargetTexture2DOES_remap_index },
+   {  6151, VertexAttribI4uivEXT_remap_index },
+   { 12358, VertexAttribI4usvEXT_remap_index },
+   { 19917, VertexAttribIPointerEXT_remap_index },
+   {  3328, FramebufferTextureLayerEXT_remap_index },
+   { 10177, ColorMaskIndexedEXT_remap_index },
+   { 28056, DisableIndexedEXT_remap_index },
+   { 28516, EnableIndexedEXT_remap_index },
+   { 23208, GetBooleanIndexedvEXT_remap_index },
+   { 26134, GetIntegerIndexedvEXT_remap_index },
+   { 24390, IsEnabledIndexedEXT_remap_index },
+   { 24290, ClearColorIiEXT_remap_index },
+   {  3766, ClearColorIuiEXT_remap_index },
+   { 10861, GetTexParameterIivEXT_remap_index },
+   {  6633, GetTexParameterIuivEXT_remap_index },
+   {  3284, TexParameterIivEXT_remap_index },
+   { 28338, TexParameterIuivEXT_remap_index },
+   {  5106, BeginConditionalRenderNV_remap_index },
+   { 27285, EndConditionalRenderNV_remap_index },
+   { 26179, BeginTransformFeedbackEXT_remap_index },
+   {  6709, BindBufferBaseEXT_remap_index },
+   { 24972, BindBufferOffsetEXT_remap_index },
+   { 13262, BindBufferRangeEXT_remap_index },
+   { 28950, EndTransformFeedbackEXT_remap_index },
+   {  5825, GetTransformFeedbackVaryingEXT_remap_index },
+   { 23986, TransformFeedbackVaryingsEXT_remap_index },
+   { 31637, ProvokingVertexEXT_remap_index },
+   { 11841, GetTexParameterPointervAPPLE_remap_index },
+   {  5648, TextureRangeAPPLE_remap_index },
+   { 12647, GetObjectParameterivAPPLE_remap_index },
+   { 21367, ObjectPurgeableAPPLE_remap_index },
+   {  6427, ObjectUnpurgeableAPPLE_remap_index },
+   { 18581, ActiveProgramEXT_remap_index },
+   {  4632, CreateShaderProgramEXT_remap_index },
+   { 30540, UseShaderProgramEXT_remap_index },
+   { 23010, TextureBarrierNV_remap_index },
+   { 30804, StencilFuncSeparateATI_remap_index },
+   {  6340, ProgramEnvParameters4fvEXT_remap_index },
+   { 18450, ProgramLocalParameters4fvEXT_remap_index },
+   { 15257, GetQueryObjecti64vEXT_remap_index },
+   { 11443, GetQueryObjectui64vEXT_remap_index },
+   { 25514, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 13151, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   {  2972, _gloffset_BlendColor },
+   {  2945, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 12279, _gloffset_BlendEquation },
+   { 12252, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 18351, _gloffset_ColorSubTable },
-   { 33857, _gloffset_CopyColorSubTable },
+   { 18324, _gloffset_ColorSubTable },
+   { 33852, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   305, _gloffset_ConvolutionFilter1D },
-   {  2771, _gloffset_CopyConvolutionFilter1D },
-   {  4449, _gloffset_GetConvolutionParameteriv },
-   {  9444, _gloffset_ConvolutionFilter2D },
-   {  9646, _gloffset_ConvolutionParameteriv },
-   { 10106, _gloffset_ConvolutionParameterfv },
-   { 22105, _gloffset_GetSeparableFilter },
-   { 25806, _gloffset_SeparableFilter2D },
-   { 26744, _gloffset_ConvolutionParameteri },
-   { 26936, _gloffset_ConvolutionParameterf },
-   { 28722, _gloffset_GetConvolutionParameterfv },
-   { 29630, _gloffset_GetConvolutionFilter },
-   { 32224, _gloffset_CopyConvolutionFilter2D },
+   {  2744, _gloffset_CopyConvolutionFilter1D },
+   {  4422, _gloffset_GetConvolutionParameteriv },
+   {  9417, _gloffset_ConvolutionFilter2D },
+   {  9619, _gloffset_ConvolutionParameteriv },
+   { 10079, _gloffset_ConvolutionParameterfv },
+   { 22088, _gloffset_GetSeparableFilter },
+   { 25789, _gloffset_SeparableFilter2D },
+   { 26727, _gloffset_ConvolutionParameteri },
+   { 26919, _gloffset_ConvolutionParameterf },
+   { 28705, _gloffset_GetConvolutionParameterfv },
+   { 29613, _gloffset_GetConvolutionFilter },
+   { 32219, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 16274, _gloffset_CopyTexSubImage3D },
-   { 18038, _gloffset_CopyTexImage2D },
-   { 26327, _gloffset_CopyTexImage1D },
-   { 29311, _gloffset_CopyTexSubImage2D },
-   { 31837, _gloffset_CopyTexSubImage1D },
+   { 16247, _gloffset_CopyTexSubImage3D },
+   { 18011, _gloffset_CopyTexImage2D },
+   { 26310, _gloffset_CopyTexImage1D },
+   { 29294, _gloffset_CopyTexSubImage2D },
+   { 31832, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   { 10471, _gloffset_DrawRangeElements },
+   { 10444, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   904, _gloffset_Histogram },
-   {  3879, _gloffset_ResetHistogram },
-   { 11034, _gloffset_GetMinmax },
-   { 16608, _gloffset_GetHistogramParameterfv },
-   { 26252, _gloffset_GetMinmaxParameteriv },
-   { 28612, _gloffset_ResetMinmax },
-   { 29527, _gloffset_GetHistogramParameteriv },
-   { 30743, _gloffset_GetHistogram },
-   { 33443, _gloffset_Minmax },
-   { 35102, _gloffset_GetMinmaxParameterfv },
+   {  3852, _gloffset_ResetHistogram },
+   { 11007, _gloffset_GetMinmax },
+   { 16581, _gloffset_GetHistogramParameterfv },
+   { 26235, _gloffset_GetMinmaxParameteriv },
+   { 28595, _gloffset_ResetMinmax },
+   { 29510, _gloffset_GetHistogramParameteriv },
+   { 30738, _gloffset_GetHistogram },
+   { 33438, _gloffset_Minmax },
+   { 35097, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  9306, _gloffset_ColorTable },
-   { 16454, _gloffset_GetColorTable },
-   { 24693, _gloffset_GetColorTableParameterfv },
-   { 26992, _gloffset_GetColorTableParameteriv },
+   {  9279, _gloffset_ColorTable },
+   { 16427, _gloffset_GetColorTable },
+   { 24676, _gloffset_GetColorTableParameterfv },
+   { 26975, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7965, _gloffset_TexSubImage1D },
-   { 11795, _gloffset_TexSubImage2D },
+   {  7938, _gloffset_TexSubImage1D },
+   { 11768, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  2031, _gloffset_TexImage3D },
-   { 24462, _gloffset_TexSubImage3D },
+   {  2004, _gloffset_TexImage3D },
+   { 24445, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3647, _gloffset_PrioritizeTextures },
-   {  8439, _gloffset_AreTexturesResident },
-   { 14692, _gloffset_GenTextures },
-   { 16985, _gloffset_DeleteTextures },
-   { 21064, _gloffset_IsTexture },
-   { 31902, _gloffset_BindTexture },
+   {  3620, _gloffset_PrioritizeTextures },
+   {  8412, _gloffset_AreTexturesResident },
+   { 14665, _gloffset_GenTextures },
+   { 16958, _gloffset_DeleteTextures },
+   { 21047, _gloffset_IsTexture },
+   { 31897, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25978, _gloffset_ArrayElement },
-   { 33031, _gloffset_GetPointerv },
-   { 34597, _gloffset_DrawArrays },
+   { 25961, _gloffset_ArrayElement },
+   { 33026, _gloffset_GetPointerv },
+   { 34592, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  8557, _gloffset_ColorTableParameteriv },
-   {  9306, _gloffset_ColorTable },
-   { 16454, _gloffset_GetColorTable },
-   { 16564, _gloffset_CopyColorTable },
-   { 20925, _gloffset_ColorTableParameterfv },
-   { 24693, _gloffset_GetColorTableParameterfv },
-   { 26992, _gloffset_GetColorTableParameteriv },
+   {  8530, _gloffset_ColorTableParameteriv },
+   {  9279, _gloffset_ColorTable },
+   { 16427, _gloffset_GetColorTable },
+   { 16537, _gloffset_CopyColorTable },
+   { 20908, _gloffset_ColorTableParameterfv },
+   { 24676, _gloffset_GetColorTableParameterfv },
+   { 26975, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   473, _gloffset_MultiTexCoord3sARB },
    {   705, _gloffset_ActiveTextureARB },
-   {  4688, _gloffset_MultiTexCoord1fvARB },
-   {  6949, _gloffset_MultiTexCoord3dARB },
-   {  6994, _gloffset_MultiTexCoord2iARB },
-   {  7118, _gloffset_MultiTexCoord2svARB },
-   {  9262, _gloffset_MultiTexCoord2fARB },
-   { 11500, _gloffset_MultiTexCoord3fvARB },
-   { 12041, _gloffset_MultiTexCoord4sARB },
-   { 12722, _gloffset_MultiTexCoord2dvARB },
-   { 13121, _gloffset_MultiTexCoord1svARB },
-   { 13486, _gloffset_MultiTexCoord3svARB },
-   { 13547, _gloffset_MultiTexCoord4iARB },
-   { 14403, _gloffset_MultiTexCoord3iARB },
-   { 15313, _gloffset_MultiTexCoord1dARB },
-   { 15510, _gloffset_MultiTexCoord3dvARB },
-   { 16826, _gloffset_MultiTexCoord3ivARB },
-   { 16871, _gloffset_MultiTexCoord2sARB },
-   { 18408, _gloffset_MultiTexCoord4ivARB },
-   { 20565, _gloffset_ClientActiveTextureARB },
-   { 22909, _gloffset_MultiTexCoord2dARB },
-   { 23390, _gloffset_MultiTexCoord4dvARB },
-   { 23767, _gloffset_MultiTexCoord4fvARB },
-   { 24834, _gloffset_MultiTexCoord3fARB },
-   { 27617, _gloffset_MultiTexCoord4dARB },
-   { 27895, _gloffset_MultiTexCoord1sARB },
-   { 28108, _gloffset_MultiTexCoord1dvARB },
-   { 29155, _gloffset_MultiTexCoord1ivARB },
-   { 29248, _gloffset_MultiTexCoord2ivARB },
-   { 29587, _gloffset_MultiTexCoord1iARB },
-   { 31018, _gloffset_MultiTexCoord4svARB },
-   { 31684, _gloffset_MultiTexCoord1fARB },
-   { 31963, _gloffset_MultiTexCoord4fARB },
-   { 34431, _gloffset_MultiTexCoord2fvARB },
+   {  4661, _gloffset_MultiTexCoord1fvARB },
+   {  6922, _gloffset_MultiTexCoord3dARB },
+   {  6967, _gloffset_MultiTexCoord2iARB },
+   {  7091, _gloffset_MultiTexCoord2svARB },
+   {  9235, _gloffset_MultiTexCoord2fARB },
+   { 11473, _gloffset_MultiTexCoord3fvARB },
+   { 12014, _gloffset_MultiTexCoord4sARB },
+   { 12695, _gloffset_MultiTexCoord2dvARB },
+   { 13094, _gloffset_MultiTexCoord1svARB },
+   { 13459, _gloffset_MultiTexCoord3svARB },
+   { 13520, _gloffset_MultiTexCoord4iARB },
+   { 14376, _gloffset_MultiTexCoord3iARB },
+   { 15286, _gloffset_MultiTexCoord1dARB },
+   { 15483, _gloffset_MultiTexCoord3dvARB },
+   { 16799, _gloffset_MultiTexCoord3ivARB },
+   { 16844, _gloffset_MultiTexCoord2sARB },
+   { 18381, _gloffset_MultiTexCoord4ivARB },
+   { 20548, _gloffset_ClientActiveTextureARB },
+   { 22892, _gloffset_MultiTexCoord2dARB },
+   { 23373, _gloffset_MultiTexCoord4dvARB },
+   { 23750, _gloffset_MultiTexCoord4fvARB },
+   { 24817, _gloffset_MultiTexCoord3fARB },
+   { 27600, _gloffset_MultiTexCoord4dARB },
+   { 27878, _gloffset_MultiTexCoord1sARB },
+   { 28091, _gloffset_MultiTexCoord1dvARB },
+   { 29138, _gloffset_MultiTexCoord1ivARB },
+   { 29231, _gloffset_MultiTexCoord2ivARB },
+   { 29570, _gloffset_MultiTexCoord1iARB },
+   { 31013, _gloffset_MultiTexCoord4svARB },
+   { 31679, _gloffset_MultiTexCoord1fARB },
+   { 31958, _gloffset_MultiTexCoord4fARB },
+   { 34426, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index c54118212..23486467d 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -3746,228 +3746,186 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
                             width, height, depth, format, imageSize, data);
 }
 
-
-/**
- * Helper for glTexBuffer().  Check if internalFormat is legal.  If so,
- * return the basic data type and number of components for the format.
- * \param return  GL_TRUE if internalFormat is legal, GL_FALSE otherwise
- */
-static GLboolean
-get_sized_format_info(const struct gl_context *ctx, GLenum internalFormat,
-                      GLenum *datatype, GLuint *components)
+static gl_format
+get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
 {
    switch (internalFormat) {
    case GL_ALPHA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_A8;
    case GL_ALPHA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_A16;
    case GL_ALPHA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_FLOAT16;
    case GL_ALPHA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_FLOAT32;
    case GL_ALPHA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT8;
    case GL_ALPHA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT16;
    case GL_ALPHA32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT32;
    case GL_ALPHA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT8;
    case GL_ALPHA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT16;
    case GL_ALPHA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT32;
    case GL_LUMINANCE8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_L8;
    case GL_LUMINANCE16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_L16;
    case GL_LUMINANCE16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_FLOAT16;
    case GL_LUMINANCE32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_FLOAT32;
    case GL_LUMINANCE8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT8;
    case GL_LUMINANCE16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT16;
    case GL_LUMINANCE32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT32;
    case GL_LUMINANCE8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT8;
    case GL_LUMINANCE16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT16;
    case GL_LUMINANCE32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT32;
    case GL_LUMINANCE8_ALPHA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_AL88;
    case GL_LUMINANCE16_ALPHA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_AL1616;
    case GL_LUMINANCE_ALPHA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;
    case GL_LUMINANCE_ALPHA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;
    case GL_LUMINANCE_ALPHA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
    case GL_LUMINANCE_ALPHA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
    case GL_LUMINANCE_ALPHA32I_EXT:
-      *datatype = GL_INT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT16;
    case GL_LUMINANCE_ALPHA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT8;
    case GL_LUMINANCE_ALPHA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT16;
    case GL_LUMINANCE_ALPHA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT32;
    case GL_INTENSITY8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_I8;
    case GL_INTENSITY16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_I16;
    case GL_INTENSITY16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_FLOAT16;
    case GL_INTENSITY32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_FLOAT32;
    case GL_INTENSITY8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT8;
    case GL_INTENSITY16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT16;
    case GL_INTENSITY32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT32;
    case GL_INTENSITY8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT8;
    case GL_INTENSITY16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT16;
    case GL_INTENSITY32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT32;
    case GL_RGBA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA8888_REV;
    case GL_RGBA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_16;
    case GL_RGBA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_FLOAT16;
    case GL_RGBA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_FLOAT32;
    case GL_RGBA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT8;
    case GL_RGBA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT16;
    case GL_RGBA32I_EXT:
-      *datatype = GL_INT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT32;
    case GL_RGBA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT8;
    case GL_RGBA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT16;
    case GL_RGBA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT32;
+
+   case GL_RG8:
+      return MESA_FORMAT_GR88;
+   case GL_RG16:
+      return MESA_FORMAT_RG1616;
+   case GL_RG16F:
+      return MESA_FORMAT_RG_FLOAT16;
+   case GL_RG32F:
+      return MESA_FORMAT_RG_FLOAT32;
+   case GL_RG8I:
+      return MESA_FORMAT_RG_INT8;
+   case GL_RG16I:
+      return MESA_FORMAT_RG_INT16;
+   case GL_RG32I:
+      return MESA_FORMAT_RG_INT32;
+   case GL_RG8UI:
+      return MESA_FORMAT_RG_UINT8;
+   case GL_RG16UI:
+      return MESA_FORMAT_RG_UINT16;
+   case GL_RG32UI:
+      return MESA_FORMAT_RG_UINT32;
+
+   case GL_R8:
+      return MESA_FORMAT_R8;
+   case GL_R16:
+      return MESA_FORMAT_R16;
+   case GL_R16F:
+      return MESA_FORMAT_R_FLOAT16;
+   case GL_R32F:
+      return MESA_FORMAT_R_FLOAT32;
+   case GL_R8I:
+      return MESA_FORMAT_R_INT8;
+   case GL_R16I:
+      return MESA_FORMAT_R_INT16;
+   case GL_R32I:
+      return MESA_FORMAT_R_INT32;
+   case GL_R8UI:
+      return MESA_FORMAT_R_UINT8;
+   case GL_R16UI:
+      return MESA_FORMAT_R_UINT16;
+   case GL_R32UI:
+      return MESA_FORMAT_R_UINT32;
+
    default:
-      return GL_FALSE;
+      return MESA_FORMAT_NONE;
    }
+}
 
-   if (*datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
-      return GL_FALSE;
+static gl_format
+validate_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
+{
+   gl_format format = get_texbuffer_format(ctx, internalFormat);
+   GLenum datatype;
 
-   if (*datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
-      return GL_FALSE;
+   if (format == MESA_FORMAT_NONE)
+      return MESA_FORMAT_NONE;
 
-   return GL_TRUE;
+   datatype = _mesa_get_format_datatype(format);
+   if (datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
+      return MESA_FORMAT_NONE;
+
+   if (datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
+      return MESA_FORMAT_NONE;
+
+   /* The GL_ARB_texture_rg and GL_ARB_texture_buffer_object specs don't make
+    * any mention of R/RG formats, but they appear in the GL 3.1 core
+    * specification.
+    */
+   if (ctx->VersionMajor < 3 ||
+       (ctx->VersionMajor == 3 && ctx->VersionMinor == 0)) {
+      GLenum base_format = _mesa_get_format_base_format(format);
+
+      if (base_format == GL_R || base_format == GL_RG)
+	 return MESA_FORMAT_NONE;
+   }
+   return format;
 }
 
 
@@ -3977,8 +3935,7 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
 {
    struct gl_texture_object *texObj;
    struct gl_buffer_object *bufObj;
-   GLenum dataType;
-   GLuint comps;
+   gl_format format;
 
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -3993,7 +3950,8 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
       return;
    }
 
-   if (!get_sized_format_info(ctx, internalFormat, &dataType, &comps)) {
+   format = validate_texbuffer_format(ctx, internalFormat);
+   if (format == MESA_FORMAT_NONE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(internalFormat 0x%x)",
                   internalFormat);
       return;
@@ -4011,6 +3969,7 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
    {
       _mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
       texObj->BufferObjectFormat = internalFormat;
+      texObj->_BufferObjectFormat = format;
    }
    _mesa_unlock_texture(ctx, texObj);
 }
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 97bef3543..4c3eed2b6 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -153,6 +153,8 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->Swizzle[3] = GL_ALPHA;
    obj->_Swizzle = SWIZZLE_NOOP;
    obj->Sampler.sRGBDecode = GL_DECODE_EXT;
+   obj->BufferObjectFormat = GL_LUMINANCE8;
+   obj->_BufferObjectFormat = MESA_FORMAT_L8;
 }
 
 
@@ -448,6 +450,14 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
    t->_BaseComplete = GL_TRUE;
    t->_MipmapComplete = GL_TRUE;
 
+   if (t->Target == GL_TEXTURE_BUFFER) {
+      /* Buffer textures are always considered complete.  The obvious case where
+       * they would be incomplete (no BO attached) is actually specced to be
+       * undefined rendering results.
+       */
+      return;
+   }
+
    /* Detect cases where the application set the base level to an invalid
     * value.
     */
@@ -755,6 +765,9 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
          target = GL_TEXTURE_1D;
          break;
       case TEXTURE_BUFFER_INDEX:
+         dims = 0;
+         target = GL_TEXTURE_BUFFER;
+         break;
       case TEXTURE_EXTERNAL_INDEX:
       default:
          /* no-op */
@@ -793,6 +806,8 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
                                     GL_RGBA, texFormat);
 
          switch (dims) {
+	 case 0:
+	    break;
          case 1:
             ctx->Driver.TexImage1D(ctx, texImage, GL_RGBA,
                                    width, 0,
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index ee778ffd0..8ca9092ce 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -390,6 +390,10 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)
 {
    struct gl_tex_env_combine_state *combine;
 
+   /* No combiners will apply to this. */
+   if (texUnit->_Current->Target == GL_TEXTURE_BUFFER)
+      return;
+
    /* Set the texUnit->_CurrentCombine field to point to the user's combiner
     * state, or the combiner state which is derived from traditional texenv
     * mode.