Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/include/scrnintstr.h
	xorg-server/xkb/ddxList.c
	xorg-server/xkb/ddxLoad.c

1 files changed, 650 insertions, 566 deletions

diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index d5e05daa5..4e21b2d6e 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -59,7 +59,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 967
+#define _gloffset_COUNT 973
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -749,292 +749,298 @@
 #define _gloffset_GetnUniformivARB 682
 #define _gloffset_GetnUniformuivARB 683
 #define _gloffset_ReadnPixelsARB 684
-#define _gloffset_PolygonOffsetEXT 685
-#define _gloffset_GetPixelTexGenParameterfvSGIS 686
-#define _gloffset_GetPixelTexGenParameterivSGIS 687
-#define _gloffset_PixelTexGenParameterfSGIS 688
-#define _gloffset_PixelTexGenParameterfvSGIS 689
-#define _gloffset_PixelTexGenParameteriSGIS 690
-#define _gloffset_PixelTexGenParameterivSGIS 691
-#define _gloffset_SampleMaskSGIS 692
-#define _gloffset_SamplePatternSGIS 693
-#define _gloffset_ColorPointerEXT 694
-#define _gloffset_EdgeFlagPointerEXT 695
-#define _gloffset_IndexPointerEXT 696
-#define _gloffset_NormalPointerEXT 697
-#define _gloffset_TexCoordPointerEXT 698
-#define _gloffset_VertexPointerEXT 699
-#define _gloffset_PointParameterfEXT 700
-#define _gloffset_PointParameterfvEXT 701
-#define _gloffset_LockArraysEXT 702
-#define _gloffset_UnlockArraysEXT 703
-#define _gloffset_SecondaryColor3bEXT 704
-#define _gloffset_SecondaryColor3bvEXT 705
-#define _gloffset_SecondaryColor3dEXT 706
-#define _gloffset_SecondaryColor3dvEXT 707
-#define _gloffset_SecondaryColor3fEXT 708
-#define _gloffset_SecondaryColor3fvEXT 709
-#define _gloffset_SecondaryColor3iEXT 710
-#define _gloffset_SecondaryColor3ivEXT 711
-#define _gloffset_SecondaryColor3sEXT 712
-#define _gloffset_SecondaryColor3svEXT 713
-#define _gloffset_SecondaryColor3ubEXT 714
-#define _gloffset_SecondaryColor3ubvEXT 715
-#define _gloffset_SecondaryColor3uiEXT 716
-#define _gloffset_SecondaryColor3uivEXT 717
-#define _gloffset_SecondaryColor3usEXT 718
-#define _gloffset_SecondaryColor3usvEXT 719
-#define _gloffset_SecondaryColorPointerEXT 720
-#define _gloffset_MultiDrawArraysEXT 721
-#define _gloffset_MultiDrawElementsEXT 722
-#define _gloffset_FogCoordPointerEXT 723
-#define _gloffset_FogCoorddEXT 724
-#define _gloffset_FogCoorddvEXT 725
-#define _gloffset_FogCoordfEXT 726
-#define _gloffset_FogCoordfvEXT 727
-#define _gloffset_PixelTexGenSGIX 728
-#define _gloffset_BlendFuncSeparateEXT 729
-#define _gloffset_FlushVertexArrayRangeNV 730
-#define _gloffset_VertexArrayRangeNV 731
-#define _gloffset_CombinerInputNV 732
-#define _gloffset_CombinerOutputNV 733
-#define _gloffset_CombinerParameterfNV 734
-#define _gloffset_CombinerParameterfvNV 735
-#define _gloffset_CombinerParameteriNV 736
-#define _gloffset_CombinerParameterivNV 737
-#define _gloffset_FinalCombinerInputNV 738
-#define _gloffset_GetCombinerInputParameterfvNV 739
-#define _gloffset_GetCombinerInputParameterivNV 740
-#define _gloffset_GetCombinerOutputParameterfvNV 741
-#define _gloffset_GetCombinerOutputParameterivNV 742
-#define _gloffset_GetFinalCombinerInputParameterfvNV 743
-#define _gloffset_GetFinalCombinerInputParameterivNV 744
-#define _gloffset_ResizeBuffersMESA 745
-#define _gloffset_WindowPos2dMESA 746
-#define _gloffset_WindowPos2dvMESA 747
-#define _gloffset_WindowPos2fMESA 748
-#define _gloffset_WindowPos2fvMESA 749
-#define _gloffset_WindowPos2iMESA 750
-#define _gloffset_WindowPos2ivMESA 751
-#define _gloffset_WindowPos2sMESA 752
-#define _gloffset_WindowPos2svMESA 753
-#define _gloffset_WindowPos3dMESA 754
-#define _gloffset_WindowPos3dvMESA 755
-#define _gloffset_WindowPos3fMESA 756
-#define _gloffset_WindowPos3fvMESA 757
-#define _gloffset_WindowPos3iMESA 758
-#define _gloffset_WindowPos3ivMESA 759
-#define _gloffset_WindowPos3sMESA 760
-#define _gloffset_WindowPos3svMESA 761
-#define _gloffset_WindowPos4dMESA 762
-#define _gloffset_WindowPos4dvMESA 763
-#define _gloffset_WindowPos4fMESA 764
-#define _gloffset_WindowPos4fvMESA 765
-#define _gloffset_WindowPos4iMESA 766
-#define _gloffset_WindowPos4ivMESA 767
-#define _gloffset_WindowPos4sMESA 768
-#define _gloffset_WindowPos4svMESA 769
-#define _gloffset_MultiModeDrawArraysIBM 770
-#define _gloffset_MultiModeDrawElementsIBM 771
-#define _gloffset_DeleteFencesNV 772
-#define _gloffset_FinishFenceNV 773
-#define _gloffset_GenFencesNV 774
-#define _gloffset_GetFenceivNV 775
-#define _gloffset_IsFenceNV 776
-#define _gloffset_SetFenceNV 777
-#define _gloffset_TestFenceNV 778
-#define _gloffset_AreProgramsResidentNV 779
-#define _gloffset_BindProgramNV 780
-#define _gloffset_DeleteProgramsNV 781
-#define _gloffset_ExecuteProgramNV 782
-#define _gloffset_GenProgramsNV 783
-#define _gloffset_GetProgramParameterdvNV 784
-#define _gloffset_GetProgramParameterfvNV 785
-#define _gloffset_GetProgramStringNV 786
-#define _gloffset_GetProgramivNV 787
-#define _gloffset_GetTrackMatrixivNV 788
-#define _gloffset_GetVertexAttribPointervNV 789
-#define _gloffset_GetVertexAttribdvNV 790
-#define _gloffset_GetVertexAttribfvNV 791
-#define _gloffset_GetVertexAttribivNV 792
-#define _gloffset_IsProgramNV 793
-#define _gloffset_LoadProgramNV 794
-#define _gloffset_ProgramParameters4dvNV 795
-#define _gloffset_ProgramParameters4fvNV 796
-#define _gloffset_RequestResidentProgramsNV 797
-#define _gloffset_TrackMatrixNV 798
-#define _gloffset_VertexAttrib1dNV 799
-#define _gloffset_VertexAttrib1dvNV 800
-#define _gloffset_VertexAttrib1fNV 801
-#define _gloffset_VertexAttrib1fvNV 802
-#define _gloffset_VertexAttrib1sNV 803
-#define _gloffset_VertexAttrib1svNV 804
-#define _gloffset_VertexAttrib2dNV 805
-#define _gloffset_VertexAttrib2dvNV 806
-#define _gloffset_VertexAttrib2fNV 807
-#define _gloffset_VertexAttrib2fvNV 808
-#define _gloffset_VertexAttrib2sNV 809
-#define _gloffset_VertexAttrib2svNV 810
-#define _gloffset_VertexAttrib3dNV 811
-#define _gloffset_VertexAttrib3dvNV 812
-#define _gloffset_VertexAttrib3fNV 813
-#define _gloffset_VertexAttrib3fvNV 814
-#define _gloffset_VertexAttrib3sNV 815
-#define _gloffset_VertexAttrib3svNV 816
-#define _gloffset_VertexAttrib4dNV 817
-#define _gloffset_VertexAttrib4dvNV 818
-#define _gloffset_VertexAttrib4fNV 819
-#define _gloffset_VertexAttrib4fvNV 820
-#define _gloffset_VertexAttrib4sNV 821
-#define _gloffset_VertexAttrib4svNV 822
-#define _gloffset_VertexAttrib4ubNV 823
-#define _gloffset_VertexAttrib4ubvNV 824
-#define _gloffset_VertexAttribPointerNV 825
-#define _gloffset_VertexAttribs1dvNV 826
-#define _gloffset_VertexAttribs1fvNV 827
-#define _gloffset_VertexAttribs1svNV 828
-#define _gloffset_VertexAttribs2dvNV 829
-#define _gloffset_VertexAttribs2fvNV 830
-#define _gloffset_VertexAttribs2svNV 831
-#define _gloffset_VertexAttribs3dvNV 832
-#define _gloffset_VertexAttribs3fvNV 833
-#define _gloffset_VertexAttribs3svNV 834
-#define _gloffset_VertexAttribs4dvNV 835
-#define _gloffset_VertexAttribs4fvNV 836
-#define _gloffset_VertexAttribs4svNV 837
-#define _gloffset_VertexAttribs4ubvNV 838
-#define _gloffset_GetTexBumpParameterfvATI 839
-#define _gloffset_GetTexBumpParameterivATI 840
-#define _gloffset_TexBumpParameterfvATI 841
-#define _gloffset_TexBumpParameterivATI 842
-#define _gloffset_AlphaFragmentOp1ATI 843
-#define _gloffset_AlphaFragmentOp2ATI 844
-#define _gloffset_AlphaFragmentOp3ATI 845
-#define _gloffset_BeginFragmentShaderATI 846
-#define _gloffset_BindFragmentShaderATI 847
-#define _gloffset_ColorFragmentOp1ATI 848
-#define _gloffset_ColorFragmentOp2ATI 849
-#define _gloffset_ColorFragmentOp3ATI 850
-#define _gloffset_DeleteFragmentShaderATI 851
-#define _gloffset_EndFragmentShaderATI 852
-#define _gloffset_GenFragmentShadersATI 853
-#define _gloffset_PassTexCoordATI 854
-#define _gloffset_SampleMapATI 855
-#define _gloffset_SetFragmentShaderConstantATI 856
-#define _gloffset_PointParameteriNV 857
-#define _gloffset_PointParameterivNV 858
-#define _gloffset_ActiveStencilFaceEXT 859
-#define _gloffset_BindVertexArrayAPPLE 860
-#define _gloffset_DeleteVertexArraysAPPLE 861
-#define _gloffset_GenVertexArraysAPPLE 862
-#define _gloffset_IsVertexArrayAPPLE 863
-#define _gloffset_GetProgramNamedParameterdvNV 864
-#define _gloffset_GetProgramNamedParameterfvNV 865
-#define _gloffset_ProgramNamedParameter4dNV 866
-#define _gloffset_ProgramNamedParameter4dvNV 867
-#define _gloffset_ProgramNamedParameter4fNV 868
-#define _gloffset_ProgramNamedParameter4fvNV 869
-#define _gloffset_PrimitiveRestartIndexNV 870
-#define _gloffset_PrimitiveRestartNV 871
-#define _gloffset_DepthBoundsEXT 872
-#define _gloffset_BlendEquationSeparateEXT 873
-#define _gloffset_BindFramebufferEXT 874
-#define _gloffset_BindRenderbufferEXT 875
-#define _gloffset_CheckFramebufferStatusEXT 876
-#define _gloffset_DeleteFramebuffersEXT 877
-#define _gloffset_DeleteRenderbuffersEXT 878
-#define _gloffset_FramebufferRenderbufferEXT 879
-#define _gloffset_FramebufferTexture1DEXT 880
-#define _gloffset_FramebufferTexture2DEXT 881
-#define _gloffset_FramebufferTexture3DEXT 882
-#define _gloffset_GenFramebuffersEXT 883
-#define _gloffset_GenRenderbuffersEXT 884
-#define _gloffset_GenerateMipmapEXT 885
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 886
-#define _gloffset_GetRenderbufferParameterivEXT 887
-#define _gloffset_IsFramebufferEXT 888
-#define _gloffset_IsRenderbufferEXT 889
-#define _gloffset_RenderbufferStorageEXT 890
-#define _gloffset_BlitFramebufferEXT 891
-#define _gloffset_BufferParameteriAPPLE 892
-#define _gloffset_FlushMappedBufferRangeAPPLE 893
-#define _gloffset_BindFragDataLocationEXT 894
-#define _gloffset_GetFragDataLocationEXT 895
-#define _gloffset_GetUniformuivEXT 896
-#define _gloffset_GetVertexAttribIivEXT 897
-#define _gloffset_GetVertexAttribIuivEXT 898
-#define _gloffset_Uniform1uiEXT 899
-#define _gloffset_Uniform1uivEXT 900
-#define _gloffset_Uniform2uiEXT 901
-#define _gloffset_Uniform2uivEXT 902
-#define _gloffset_Uniform3uiEXT 903
-#define _gloffset_Uniform3uivEXT 904
-#define _gloffset_Uniform4uiEXT 905
-#define _gloffset_Uniform4uivEXT 906
-#define _gloffset_VertexAttribI1iEXT 907
-#define _gloffset_VertexAttribI1ivEXT 908
-#define _gloffset_VertexAttribI1uiEXT 909
-#define _gloffset_VertexAttribI1uivEXT 910
-#define _gloffset_VertexAttribI2iEXT 911
-#define _gloffset_VertexAttribI2ivEXT 912
-#define _gloffset_VertexAttribI2uiEXT 913
-#define _gloffset_VertexAttribI2uivEXT 914
-#define _gloffset_VertexAttribI3iEXT 915
-#define _gloffset_VertexAttribI3ivEXT 916
-#define _gloffset_VertexAttribI3uiEXT 917
-#define _gloffset_VertexAttribI3uivEXT 918
-#define _gloffset_VertexAttribI4bvEXT 919
-#define _gloffset_VertexAttribI4iEXT 920
-#define _gloffset_VertexAttribI4ivEXT 921
-#define _gloffset_VertexAttribI4svEXT 922
-#define _gloffset_VertexAttribI4ubvEXT 923
-#define _gloffset_VertexAttribI4uiEXT 924
-#define _gloffset_VertexAttribI4uivEXT 925
-#define _gloffset_VertexAttribI4usvEXT 926
-#define _gloffset_VertexAttribIPointerEXT 927
-#define _gloffset_FramebufferTextureLayerEXT 928
-#define _gloffset_ColorMaskIndexedEXT 929
-#define _gloffset_DisableIndexedEXT 930
-#define _gloffset_EnableIndexedEXT 931
-#define _gloffset_GetBooleanIndexedvEXT 932
-#define _gloffset_GetIntegerIndexedvEXT 933
-#define _gloffset_IsEnabledIndexedEXT 934
-#define _gloffset_ClearColorIiEXT 935
-#define _gloffset_ClearColorIuiEXT 936
-#define _gloffset_GetTexParameterIivEXT 937
-#define _gloffset_GetTexParameterIuivEXT 938
-#define _gloffset_TexParameterIivEXT 939
-#define _gloffset_TexParameterIuivEXT 940
-#define _gloffset_BeginConditionalRenderNV 941
-#define _gloffset_EndConditionalRenderNV 942
-#define _gloffset_BeginTransformFeedbackEXT 943
-#define _gloffset_BindBufferBaseEXT 944
-#define _gloffset_BindBufferOffsetEXT 945
-#define _gloffset_BindBufferRangeEXT 946
-#define _gloffset_EndTransformFeedbackEXT 947
-#define _gloffset_GetTransformFeedbackVaryingEXT 948
-#define _gloffset_TransformFeedbackVaryingsEXT 949
-#define _gloffset_ProvokingVertexEXT 950
-#define _gloffset_GetTexParameterPointervAPPLE 951
-#define _gloffset_TextureRangeAPPLE 952
-#define _gloffset_GetObjectParameterivAPPLE 953
-#define _gloffset_ObjectPurgeableAPPLE 954
-#define _gloffset_ObjectUnpurgeableAPPLE 955
-#define _gloffset_ActiveProgramEXT 956
-#define _gloffset_CreateShaderProgramEXT 957
-#define _gloffset_UseShaderProgramEXT 958
-#define _gloffset_TextureBarrierNV 959
-#define _gloffset_StencilFuncSeparateATI 960
-#define _gloffset_ProgramEnvParameters4fvEXT 961
-#define _gloffset_ProgramLocalParameters4fvEXT 962
-#define _gloffset_GetQueryObjecti64vEXT 963
-#define _gloffset_GetQueryObjectui64vEXT 964
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 965
-#define _gloffset_EGLImageTargetTexture2DOES 966
+#define _gloffset_TexStorage1D 685
+#define _gloffset_TexStorage2D 686
+#define _gloffset_TexStorage3D 687
+#define _gloffset_TextureStorage1DEXT 688
+#define _gloffset_TextureStorage2DEXT 689
+#define _gloffset_TextureStorage3DEXT 690
+#define _gloffset_PolygonOffsetEXT 691
+#define _gloffset_GetPixelTexGenParameterfvSGIS 692
+#define _gloffset_GetPixelTexGenParameterivSGIS 693
+#define _gloffset_PixelTexGenParameterfSGIS 694
+#define _gloffset_PixelTexGenParameterfvSGIS 695
+#define _gloffset_PixelTexGenParameteriSGIS 696
+#define _gloffset_PixelTexGenParameterivSGIS 697
+#define _gloffset_SampleMaskSGIS 698
+#define _gloffset_SamplePatternSGIS 699
+#define _gloffset_ColorPointerEXT 700
+#define _gloffset_EdgeFlagPointerEXT 701
+#define _gloffset_IndexPointerEXT 702
+#define _gloffset_NormalPointerEXT 703
+#define _gloffset_TexCoordPointerEXT 704
+#define _gloffset_VertexPointerEXT 705
+#define _gloffset_PointParameterfEXT 706
+#define _gloffset_PointParameterfvEXT 707
+#define _gloffset_LockArraysEXT 708
+#define _gloffset_UnlockArraysEXT 709
+#define _gloffset_SecondaryColor3bEXT 710
+#define _gloffset_SecondaryColor3bvEXT 711
+#define _gloffset_SecondaryColor3dEXT 712
+#define _gloffset_SecondaryColor3dvEXT 713
+#define _gloffset_SecondaryColor3fEXT 714
+#define _gloffset_SecondaryColor3fvEXT 715
+#define _gloffset_SecondaryColor3iEXT 716
+#define _gloffset_SecondaryColor3ivEXT 717
+#define _gloffset_SecondaryColor3sEXT 718
+#define _gloffset_SecondaryColor3svEXT 719
+#define _gloffset_SecondaryColor3ubEXT 720
+#define _gloffset_SecondaryColor3ubvEXT 721
+#define _gloffset_SecondaryColor3uiEXT 722
+#define _gloffset_SecondaryColor3uivEXT 723
+#define _gloffset_SecondaryColor3usEXT 724
+#define _gloffset_SecondaryColor3usvEXT 725
+#define _gloffset_SecondaryColorPointerEXT 726
+#define _gloffset_MultiDrawArraysEXT 727
+#define _gloffset_MultiDrawElementsEXT 728
+#define _gloffset_FogCoordPointerEXT 729
+#define _gloffset_FogCoorddEXT 730
+#define _gloffset_FogCoorddvEXT 731
+#define _gloffset_FogCoordfEXT 732
+#define _gloffset_FogCoordfvEXT 733
+#define _gloffset_PixelTexGenSGIX 734
+#define _gloffset_BlendFuncSeparateEXT 735
+#define _gloffset_FlushVertexArrayRangeNV 736
+#define _gloffset_VertexArrayRangeNV 737
+#define _gloffset_CombinerInputNV 738
+#define _gloffset_CombinerOutputNV 739
+#define _gloffset_CombinerParameterfNV 740
+#define _gloffset_CombinerParameterfvNV 741
+#define _gloffset_CombinerParameteriNV 742
+#define _gloffset_CombinerParameterivNV 743
+#define _gloffset_FinalCombinerInputNV 744
+#define _gloffset_GetCombinerInputParameterfvNV 745
+#define _gloffset_GetCombinerInputParameterivNV 746
+#define _gloffset_GetCombinerOutputParameterfvNV 747
+#define _gloffset_GetCombinerOutputParameterivNV 748
+#define _gloffset_GetFinalCombinerInputParameterfvNV 749
+#define _gloffset_GetFinalCombinerInputParameterivNV 750
+#define _gloffset_ResizeBuffersMESA 751
+#define _gloffset_WindowPos2dMESA 752
+#define _gloffset_WindowPos2dvMESA 753
+#define _gloffset_WindowPos2fMESA 754
+#define _gloffset_WindowPos2fvMESA 755
+#define _gloffset_WindowPos2iMESA 756
+#define _gloffset_WindowPos2ivMESA 757
+#define _gloffset_WindowPos2sMESA 758
+#define _gloffset_WindowPos2svMESA 759
+#define _gloffset_WindowPos3dMESA 760
+#define _gloffset_WindowPos3dvMESA 761
+#define _gloffset_WindowPos3fMESA 762
+#define _gloffset_WindowPos3fvMESA 763
+#define _gloffset_WindowPos3iMESA 764
+#define _gloffset_WindowPos3ivMESA 765
+#define _gloffset_WindowPos3sMESA 766
+#define _gloffset_WindowPos3svMESA 767
+#define _gloffset_WindowPos4dMESA 768
+#define _gloffset_WindowPos4dvMESA 769
+#define _gloffset_WindowPos4fMESA 770
+#define _gloffset_WindowPos4fvMESA 771
+#define _gloffset_WindowPos4iMESA 772
+#define _gloffset_WindowPos4ivMESA 773
+#define _gloffset_WindowPos4sMESA 774
+#define _gloffset_WindowPos4svMESA 775
+#define _gloffset_MultiModeDrawArraysIBM 776
+#define _gloffset_MultiModeDrawElementsIBM 777
+#define _gloffset_DeleteFencesNV 778
+#define _gloffset_FinishFenceNV 779
+#define _gloffset_GenFencesNV 780
+#define _gloffset_GetFenceivNV 781
+#define _gloffset_IsFenceNV 782
+#define _gloffset_SetFenceNV 783
+#define _gloffset_TestFenceNV 784
+#define _gloffset_AreProgramsResidentNV 785
+#define _gloffset_BindProgramNV 786
+#define _gloffset_DeleteProgramsNV 787
+#define _gloffset_ExecuteProgramNV 788
+#define _gloffset_GenProgramsNV 789
+#define _gloffset_GetProgramParameterdvNV 790
+#define _gloffset_GetProgramParameterfvNV 791
+#define _gloffset_GetProgramStringNV 792
+#define _gloffset_GetProgramivNV 793
+#define _gloffset_GetTrackMatrixivNV 794
+#define _gloffset_GetVertexAttribPointervNV 795
+#define _gloffset_GetVertexAttribdvNV 796
+#define _gloffset_GetVertexAttribfvNV 797
+#define _gloffset_GetVertexAttribivNV 798
+#define _gloffset_IsProgramNV 799
+#define _gloffset_LoadProgramNV 800
+#define _gloffset_ProgramParameters4dvNV 801
+#define _gloffset_ProgramParameters4fvNV 802
+#define _gloffset_RequestResidentProgramsNV 803
+#define _gloffset_TrackMatrixNV 804
+#define _gloffset_VertexAttrib1dNV 805
+#define _gloffset_VertexAttrib1dvNV 806
+#define _gloffset_VertexAttrib1fNV 807
+#define _gloffset_VertexAttrib1fvNV 808
+#define _gloffset_VertexAttrib1sNV 809
+#define _gloffset_VertexAttrib1svNV 810
+#define _gloffset_VertexAttrib2dNV 811
+#define _gloffset_VertexAttrib2dvNV 812
+#define _gloffset_VertexAttrib2fNV 813
+#define _gloffset_VertexAttrib2fvNV 814
+#define _gloffset_VertexAttrib2sNV 815
+#define _gloffset_VertexAttrib2svNV 816
+#define _gloffset_VertexAttrib3dNV 817
+#define _gloffset_VertexAttrib3dvNV 818
+#define _gloffset_VertexAttrib3fNV 819
+#define _gloffset_VertexAttrib3fvNV 820
+#define _gloffset_VertexAttrib3sNV 821
+#define _gloffset_VertexAttrib3svNV 822
+#define _gloffset_VertexAttrib4dNV 823
+#define _gloffset_VertexAttrib4dvNV 824
+#define _gloffset_VertexAttrib4fNV 825
+#define _gloffset_VertexAttrib4fvNV 826
+#define _gloffset_VertexAttrib4sNV 827
+#define _gloffset_VertexAttrib4svNV 828
+#define _gloffset_VertexAttrib4ubNV 829
+#define _gloffset_VertexAttrib4ubvNV 830
+#define _gloffset_VertexAttribPointerNV 831
+#define _gloffset_VertexAttribs1dvNV 832
+#define _gloffset_VertexAttribs1fvNV 833
+#define _gloffset_VertexAttribs1svNV 834
+#define _gloffset_VertexAttribs2dvNV 835
+#define _gloffset_VertexAttribs2fvNV 836
+#define _gloffset_VertexAttribs2svNV 837
+#define _gloffset_VertexAttribs3dvNV 838
+#define _gloffset_VertexAttribs3fvNV 839
+#define _gloffset_VertexAttribs3svNV 840
+#define _gloffset_VertexAttribs4dvNV 841
+#define _gloffset_VertexAttribs4fvNV 842
+#define _gloffset_VertexAttribs4svNV 843
+#define _gloffset_VertexAttribs4ubvNV 844
+#define _gloffset_GetTexBumpParameterfvATI 845
+#define _gloffset_GetTexBumpParameterivATI 846
+#define _gloffset_TexBumpParameterfvATI 847
+#define _gloffset_TexBumpParameterivATI 848
+#define _gloffset_AlphaFragmentOp1ATI 849
+#define _gloffset_AlphaFragmentOp2ATI 850
+#define _gloffset_AlphaFragmentOp3ATI 851
+#define _gloffset_BeginFragmentShaderATI 852
+#define _gloffset_BindFragmentShaderATI 853
+#define _gloffset_ColorFragmentOp1ATI 854
+#define _gloffset_ColorFragmentOp2ATI 855
+#define _gloffset_ColorFragmentOp3ATI 856
+#define _gloffset_DeleteFragmentShaderATI 857
+#define _gloffset_EndFragmentShaderATI 858
+#define _gloffset_GenFragmentShadersATI 859
+#define _gloffset_PassTexCoordATI 860
+#define _gloffset_SampleMapATI 861
+#define _gloffset_SetFragmentShaderConstantATI 862
+#define _gloffset_PointParameteriNV 863
+#define _gloffset_PointParameterivNV 864
+#define _gloffset_ActiveStencilFaceEXT 865
+#define _gloffset_BindVertexArrayAPPLE 866
+#define _gloffset_DeleteVertexArraysAPPLE 867
+#define _gloffset_GenVertexArraysAPPLE 868
+#define _gloffset_IsVertexArrayAPPLE 869
+#define _gloffset_GetProgramNamedParameterdvNV 870
+#define _gloffset_GetProgramNamedParameterfvNV 871
+#define _gloffset_ProgramNamedParameter4dNV 872
+#define _gloffset_ProgramNamedParameter4dvNV 873
+#define _gloffset_ProgramNamedParameter4fNV 874
+#define _gloffset_ProgramNamedParameter4fvNV 875
+#define _gloffset_PrimitiveRestartIndexNV 876
+#define _gloffset_PrimitiveRestartNV 877
+#define _gloffset_DepthBoundsEXT 878
+#define _gloffset_BlendEquationSeparateEXT 879
+#define _gloffset_BindFramebufferEXT 880
+#define _gloffset_BindRenderbufferEXT 881
+#define _gloffset_CheckFramebufferStatusEXT 882
+#define _gloffset_DeleteFramebuffersEXT 883
+#define _gloffset_DeleteRenderbuffersEXT 884
+#define _gloffset_FramebufferRenderbufferEXT 885
+#define _gloffset_FramebufferTexture1DEXT 886
+#define _gloffset_FramebufferTexture2DEXT 887
+#define _gloffset_FramebufferTexture3DEXT 888
+#define _gloffset_GenFramebuffersEXT 889
+#define _gloffset_GenRenderbuffersEXT 890
+#define _gloffset_GenerateMipmapEXT 891
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 892
+#define _gloffset_GetRenderbufferParameterivEXT 893
+#define _gloffset_IsFramebufferEXT 894
+#define _gloffset_IsRenderbufferEXT 895
+#define _gloffset_RenderbufferStorageEXT 896
+#define _gloffset_BlitFramebufferEXT 897
+#define _gloffset_BufferParameteriAPPLE 898
+#define _gloffset_FlushMappedBufferRangeAPPLE 899
+#define _gloffset_BindFragDataLocationEXT 900
+#define _gloffset_GetFragDataLocationEXT 901
+#define _gloffset_GetUniformuivEXT 902
+#define _gloffset_GetVertexAttribIivEXT 903
+#define _gloffset_GetVertexAttribIuivEXT 904
+#define _gloffset_Uniform1uiEXT 905
+#define _gloffset_Uniform1uivEXT 906
+#define _gloffset_Uniform2uiEXT 907
+#define _gloffset_Uniform2uivEXT 908
+#define _gloffset_Uniform3uiEXT 909
+#define _gloffset_Uniform3uivEXT 910
+#define _gloffset_Uniform4uiEXT 911
+#define _gloffset_Uniform4uivEXT 912
+#define _gloffset_VertexAttribI1iEXT 913
+#define _gloffset_VertexAttribI1ivEXT 914
+#define _gloffset_VertexAttribI1uiEXT 915
+#define _gloffset_VertexAttribI1uivEXT 916
+#define _gloffset_VertexAttribI2iEXT 917
+#define _gloffset_VertexAttribI2ivEXT 918
+#define _gloffset_VertexAttribI2uiEXT 919
+#define _gloffset_VertexAttribI2uivEXT 920
+#define _gloffset_VertexAttribI3iEXT 921
+#define _gloffset_VertexAttribI3ivEXT 922
+#define _gloffset_VertexAttribI3uiEXT 923
+#define _gloffset_VertexAttribI3uivEXT 924
+#define _gloffset_VertexAttribI4bvEXT 925
+#define _gloffset_VertexAttribI4iEXT 926
+#define _gloffset_VertexAttribI4ivEXT 927
+#define _gloffset_VertexAttribI4svEXT 928
+#define _gloffset_VertexAttribI4ubvEXT 929
+#define _gloffset_VertexAttribI4uiEXT 930
+#define _gloffset_VertexAttribI4uivEXT 931
+#define _gloffset_VertexAttribI4usvEXT 932
+#define _gloffset_VertexAttribIPointerEXT 933
+#define _gloffset_FramebufferTextureLayerEXT 934
+#define _gloffset_ColorMaskIndexedEXT 935
+#define _gloffset_DisableIndexedEXT 936
+#define _gloffset_EnableIndexedEXT 937
+#define _gloffset_GetBooleanIndexedvEXT 938
+#define _gloffset_GetIntegerIndexedvEXT 939
+#define _gloffset_IsEnabledIndexedEXT 940
+#define _gloffset_ClearColorIiEXT 941
+#define _gloffset_ClearColorIuiEXT 942
+#define _gloffset_GetTexParameterIivEXT 943
+#define _gloffset_GetTexParameterIuivEXT 944
+#define _gloffset_TexParameterIivEXT 945
+#define _gloffset_TexParameterIuivEXT 946
+#define _gloffset_BeginConditionalRenderNV 947
+#define _gloffset_EndConditionalRenderNV 948
+#define _gloffset_BeginTransformFeedbackEXT 949
+#define _gloffset_BindBufferBaseEXT 950
+#define _gloffset_BindBufferOffsetEXT 951
+#define _gloffset_BindBufferRangeEXT 952
+#define _gloffset_EndTransformFeedbackEXT 953
+#define _gloffset_GetTransformFeedbackVaryingEXT 954
+#define _gloffset_TransformFeedbackVaryingsEXT 955
+#define _gloffset_ProvokingVertexEXT 956
+#define _gloffset_GetTexParameterPointervAPPLE 957
+#define _gloffset_TextureRangeAPPLE 958
+#define _gloffset_GetObjectParameterivAPPLE 959
+#define _gloffset_ObjectPurgeableAPPLE 960
+#define _gloffset_ObjectUnpurgeableAPPLE 961
+#define _gloffset_ActiveProgramEXT 962
+#define _gloffset_CreateShaderProgramEXT 963
+#define _gloffset_UseShaderProgramEXT 964
+#define _gloffset_TextureBarrierNV 965
+#define _gloffset_StencilFuncSeparateATI 966
+#define _gloffset_ProgramEnvParameters4fvEXT 967
+#define _gloffset_ProgramLocalParameters4fvEXT 968
+#define _gloffset_GetQueryObjecti64vEXT 969
+#define _gloffset_GetQueryObjectui64vEXT 970
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 971
+#define _gloffset_EGLImageTargetTexture2DOES 972
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 559
+#define driDispatchRemapTable_size 565
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1314,288 +1320,294 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetnUniformivARB_remap_index 274
 #define GetnUniformuivARB_remap_index 275
 #define ReadnPixelsARB_remap_index 276
-#define PolygonOffsetEXT_remap_index 277
-#define GetPixelTexGenParameterfvSGIS_remap_index 278
-#define GetPixelTexGenParameterivSGIS_remap_index 279
-#define PixelTexGenParameterfSGIS_remap_index 280
-#define PixelTexGenParameterfvSGIS_remap_index 281
-#define PixelTexGenParameteriSGIS_remap_index 282
-#define PixelTexGenParameterivSGIS_remap_index 283
-#define SampleMaskSGIS_remap_index 284
-#define SamplePatternSGIS_remap_index 285
-#define ColorPointerEXT_remap_index 286
-#define EdgeFlagPointerEXT_remap_index 287
-#define IndexPointerEXT_remap_index 288
-#define NormalPointerEXT_remap_index 289
-#define TexCoordPointerEXT_remap_index 290
-#define VertexPointerEXT_remap_index 291
-#define PointParameterfEXT_remap_index 292
-#define PointParameterfvEXT_remap_index 293
-#define LockArraysEXT_remap_index 294
-#define UnlockArraysEXT_remap_index 295
-#define SecondaryColor3bEXT_remap_index 296
-#define SecondaryColor3bvEXT_remap_index 297
-#define SecondaryColor3dEXT_remap_index 298
-#define SecondaryColor3dvEXT_remap_index 299
-#define SecondaryColor3fEXT_remap_index 300
-#define SecondaryColor3fvEXT_remap_index 301
-#define SecondaryColor3iEXT_remap_index 302
-#define SecondaryColor3ivEXT_remap_index 303
-#define SecondaryColor3sEXT_remap_index 304
-#define SecondaryColor3svEXT_remap_index 305
-#define SecondaryColor3ubEXT_remap_index 306
-#define SecondaryColor3ubvEXT_remap_index 307
-#define SecondaryColor3uiEXT_remap_index 308
-#define SecondaryColor3uivEXT_remap_index 309
-#define SecondaryColor3usEXT_remap_index 310
-#define SecondaryColor3usvEXT_remap_index 311
-#define SecondaryColorPointerEXT_remap_index 312
-#define MultiDrawArraysEXT_remap_index 313
-#define MultiDrawElementsEXT_remap_index 314
-#define FogCoordPointerEXT_remap_index 315
-#define FogCoorddEXT_remap_index 316
-#define FogCoorddvEXT_remap_index 317
-#define FogCoordfEXT_remap_index 318
-#define FogCoordfvEXT_remap_index 319
-#define PixelTexGenSGIX_remap_index 320
-#define BlendFuncSeparateEXT_remap_index 321
-#define FlushVertexArrayRangeNV_remap_index 322
-#define VertexArrayRangeNV_remap_index 323
-#define CombinerInputNV_remap_index 324
-#define CombinerOutputNV_remap_index 325
-#define CombinerParameterfNV_remap_index 326
-#define CombinerParameterfvNV_remap_index 327
-#define CombinerParameteriNV_remap_index 328
-#define CombinerParameterivNV_remap_index 329
-#define FinalCombinerInputNV_remap_index 330
-#define GetCombinerInputParameterfvNV_remap_index 331
-#define GetCombinerInputParameterivNV_remap_index 332
-#define GetCombinerOutputParameterfvNV_remap_index 333
-#define GetCombinerOutputParameterivNV_remap_index 334
-#define GetFinalCombinerInputParameterfvNV_remap_index 335
-#define GetFinalCombinerInputParameterivNV_remap_index 336
-#define ResizeBuffersMESA_remap_index 337
-#define WindowPos2dMESA_remap_index 338
-#define WindowPos2dvMESA_remap_index 339
-#define WindowPos2fMESA_remap_index 340
-#define WindowPos2fvMESA_remap_index 341
-#define WindowPos2iMESA_remap_index 342
-#define WindowPos2ivMESA_remap_index 343
-#define WindowPos2sMESA_remap_index 344
-#define WindowPos2svMESA_remap_index 345
-#define WindowPos3dMESA_remap_index 346
-#define WindowPos3dvMESA_remap_index 347
-#define WindowPos3fMESA_remap_index 348
-#define WindowPos3fvMESA_remap_index 349
-#define WindowPos3iMESA_remap_index 350
-#define WindowPos3ivMESA_remap_index 351
-#define WindowPos3sMESA_remap_index 352
-#define WindowPos3svMESA_remap_index 353
-#define WindowPos4dMESA_remap_index 354
-#define WindowPos4dvMESA_remap_index 355
-#define WindowPos4fMESA_remap_index 356
-#define WindowPos4fvMESA_remap_index 357
-#define WindowPos4iMESA_remap_index 358
-#define WindowPos4ivMESA_remap_index 359
-#define WindowPos4sMESA_remap_index 360
-#define WindowPos4svMESA_remap_index 361
-#define MultiModeDrawArraysIBM_remap_index 362
-#define MultiModeDrawElementsIBM_remap_index 363
-#define DeleteFencesNV_remap_index 364
-#define FinishFenceNV_remap_index 365
-#define GenFencesNV_remap_index 366
-#define GetFenceivNV_remap_index 367
-#define IsFenceNV_remap_index 368
-#define SetFenceNV_remap_index 369
-#define TestFenceNV_remap_index 370
-#define AreProgramsResidentNV_remap_index 371
-#define BindProgramNV_remap_index 372
-#define DeleteProgramsNV_remap_index 373
-#define ExecuteProgramNV_remap_index 374
-#define GenProgramsNV_remap_index 375
-#define GetProgramParameterdvNV_remap_index 376
-#define GetProgramParameterfvNV_remap_index 377
-#define GetProgramStringNV_remap_index 378
-#define GetProgramivNV_remap_index 379
-#define GetTrackMatrixivNV_remap_index 380
-#define GetVertexAttribPointervNV_remap_index 381
-#define GetVertexAttribdvNV_remap_index 382
-#define GetVertexAttribfvNV_remap_index 383
-#define GetVertexAttribivNV_remap_index 384
-#define IsProgramNV_remap_index 385
-#define LoadProgramNV_remap_index 386
-#define ProgramParameters4dvNV_remap_index 387
-#define ProgramParameters4fvNV_remap_index 388
-#define RequestResidentProgramsNV_remap_index 389
-#define TrackMatrixNV_remap_index 390
-#define VertexAttrib1dNV_remap_index 391
-#define VertexAttrib1dvNV_remap_index 392
-#define VertexAttrib1fNV_remap_index 393
-#define VertexAttrib1fvNV_remap_index 394
-#define VertexAttrib1sNV_remap_index 395
-#define VertexAttrib1svNV_remap_index 396
-#define VertexAttrib2dNV_remap_index 397
-#define VertexAttrib2dvNV_remap_index 398
-#define VertexAttrib2fNV_remap_index 399
-#define VertexAttrib2fvNV_remap_index 400
-#define VertexAttrib2sNV_remap_index 401
-#define VertexAttrib2svNV_remap_index 402
-#define VertexAttrib3dNV_remap_index 403
-#define VertexAttrib3dvNV_remap_index 404
-#define VertexAttrib3fNV_remap_index 405
-#define VertexAttrib3fvNV_remap_index 406
-#define VertexAttrib3sNV_remap_index 407
-#define VertexAttrib3svNV_remap_index 408
-#define VertexAttrib4dNV_remap_index 409
-#define VertexAttrib4dvNV_remap_index 410
-#define VertexAttrib4fNV_remap_index 411
-#define VertexAttrib4fvNV_remap_index 412
-#define VertexAttrib4sNV_remap_index 413
-#define VertexAttrib4svNV_remap_index 414
-#define VertexAttrib4ubNV_remap_index 415
-#define VertexAttrib4ubvNV_remap_index 416
-#define VertexAttribPointerNV_remap_index 417
-#define VertexAttribs1dvNV_remap_index 418
-#define VertexAttribs1fvNV_remap_index 419
-#define VertexAttribs1svNV_remap_index 420
-#define VertexAttribs2dvNV_remap_index 421
-#define VertexAttribs2fvNV_remap_index 422
-#define VertexAttribs2svNV_remap_index 423
-#define VertexAttribs3dvNV_remap_index 424
-#define VertexAttribs3fvNV_remap_index 425
-#define VertexAttribs3svNV_remap_index 426
-#define VertexAttribs4dvNV_remap_index 427
-#define VertexAttribs4fvNV_remap_index 428
-#define VertexAttribs4svNV_remap_index 429
-#define VertexAttribs4ubvNV_remap_index 430
-#define GetTexBumpParameterfvATI_remap_index 431
-#define GetTexBumpParameterivATI_remap_index 432
-#define TexBumpParameterfvATI_remap_index 433
-#define TexBumpParameterivATI_remap_index 434
-#define AlphaFragmentOp1ATI_remap_index 435
-#define AlphaFragmentOp2ATI_remap_index 436
-#define AlphaFragmentOp3ATI_remap_index 437
-#define BeginFragmentShaderATI_remap_index 438
-#define BindFragmentShaderATI_remap_index 439
-#define ColorFragmentOp1ATI_remap_index 440
-#define ColorFragmentOp2ATI_remap_index 441
-#define ColorFragmentOp3ATI_remap_index 442
-#define DeleteFragmentShaderATI_remap_index 443
-#define EndFragmentShaderATI_remap_index 444
-#define GenFragmentShadersATI_remap_index 445
-#define PassTexCoordATI_remap_index 446
-#define SampleMapATI_remap_index 447
-#define SetFragmentShaderConstantATI_remap_index 448
-#define PointParameteriNV_remap_index 449
-#define PointParameterivNV_remap_index 450
-#define ActiveStencilFaceEXT_remap_index 451
-#define BindVertexArrayAPPLE_remap_index 452
-#define DeleteVertexArraysAPPLE_remap_index 453
-#define GenVertexArraysAPPLE_remap_index 454
-#define IsVertexArrayAPPLE_remap_index 455
-#define GetProgramNamedParameterdvNV_remap_index 456
-#define GetProgramNamedParameterfvNV_remap_index 457
-#define ProgramNamedParameter4dNV_remap_index 458
-#define ProgramNamedParameter4dvNV_remap_index 459
-#define ProgramNamedParameter4fNV_remap_index 460
-#define ProgramNamedParameter4fvNV_remap_index 461
-#define PrimitiveRestartIndexNV_remap_index 462
-#define PrimitiveRestartNV_remap_index 463
-#define DepthBoundsEXT_remap_index 464
-#define BlendEquationSeparateEXT_remap_index 465
-#define BindFramebufferEXT_remap_index 466
-#define BindRenderbufferEXT_remap_index 467
-#define CheckFramebufferStatusEXT_remap_index 468
-#define DeleteFramebuffersEXT_remap_index 469
-#define DeleteRenderbuffersEXT_remap_index 470
-#define FramebufferRenderbufferEXT_remap_index 471
-#define FramebufferTexture1DEXT_remap_index 472
-#define FramebufferTexture2DEXT_remap_index 473
-#define FramebufferTexture3DEXT_remap_index 474
-#define GenFramebuffersEXT_remap_index 475
-#define GenRenderbuffersEXT_remap_index 476
-#define GenerateMipmapEXT_remap_index 477
-#define GetFramebufferAttachmentParameterivEXT_remap_index 478
-#define GetRenderbufferParameterivEXT_remap_index 479
-#define IsFramebufferEXT_remap_index 480
-#define IsRenderbufferEXT_remap_index 481
-#define RenderbufferStorageEXT_remap_index 482
-#define BlitFramebufferEXT_remap_index 483
-#define BufferParameteriAPPLE_remap_index 484
-#define FlushMappedBufferRangeAPPLE_remap_index 485
-#define BindFragDataLocationEXT_remap_index 486
-#define GetFragDataLocationEXT_remap_index 487
-#define GetUniformuivEXT_remap_index 488
-#define GetVertexAttribIivEXT_remap_index 489
-#define GetVertexAttribIuivEXT_remap_index 490
-#define Uniform1uiEXT_remap_index 491
-#define Uniform1uivEXT_remap_index 492
-#define Uniform2uiEXT_remap_index 493
-#define Uniform2uivEXT_remap_index 494
-#define Uniform3uiEXT_remap_index 495
-#define Uniform3uivEXT_remap_index 496
-#define Uniform4uiEXT_remap_index 497
-#define Uniform4uivEXT_remap_index 498
-#define VertexAttribI1iEXT_remap_index 499
-#define VertexAttribI1ivEXT_remap_index 500
-#define VertexAttribI1uiEXT_remap_index 501
-#define VertexAttribI1uivEXT_remap_index 502
-#define VertexAttribI2iEXT_remap_index 503
-#define VertexAttribI2ivEXT_remap_index 504
-#define VertexAttribI2uiEXT_remap_index 505
-#define VertexAttribI2uivEXT_remap_index 506
-#define VertexAttribI3iEXT_remap_index 507
-#define VertexAttribI3ivEXT_remap_index 508
-#define VertexAttribI3uiEXT_remap_index 509
-#define VertexAttribI3uivEXT_remap_index 510
-#define VertexAttribI4bvEXT_remap_index 511
-#define VertexAttribI4iEXT_remap_index 512
-#define VertexAttribI4ivEXT_remap_index 513
-#define VertexAttribI4svEXT_remap_index 514
-#define VertexAttribI4ubvEXT_remap_index 515
-#define VertexAttribI4uiEXT_remap_index 516
-#define VertexAttribI4uivEXT_remap_index 517
-#define VertexAttribI4usvEXT_remap_index 518
-#define VertexAttribIPointerEXT_remap_index 519
-#define FramebufferTextureLayerEXT_remap_index 520
-#define ColorMaskIndexedEXT_remap_index 521
-#define DisableIndexedEXT_remap_index 522
-#define EnableIndexedEXT_remap_index 523
-#define GetBooleanIndexedvEXT_remap_index 524
-#define GetIntegerIndexedvEXT_remap_index 525
-#define IsEnabledIndexedEXT_remap_index 526
-#define ClearColorIiEXT_remap_index 527
-#define ClearColorIuiEXT_remap_index 528
-#define GetTexParameterIivEXT_remap_index 529
-#define GetTexParameterIuivEXT_remap_index 530
-#define TexParameterIivEXT_remap_index 531
-#define TexParameterIuivEXT_remap_index 532
-#define BeginConditionalRenderNV_remap_index 533
-#define EndConditionalRenderNV_remap_index 534
-#define BeginTransformFeedbackEXT_remap_index 535
-#define BindBufferBaseEXT_remap_index 536
-#define BindBufferOffsetEXT_remap_index 537
-#define BindBufferRangeEXT_remap_index 538
-#define EndTransformFeedbackEXT_remap_index 539
-#define GetTransformFeedbackVaryingEXT_remap_index 540
-#define TransformFeedbackVaryingsEXT_remap_index 541
-#define ProvokingVertexEXT_remap_index 542
-#define GetTexParameterPointervAPPLE_remap_index 543
-#define TextureRangeAPPLE_remap_index 544
-#define GetObjectParameterivAPPLE_remap_index 545
-#define ObjectPurgeableAPPLE_remap_index 546
-#define ObjectUnpurgeableAPPLE_remap_index 547
-#define ActiveProgramEXT_remap_index 548
-#define CreateShaderProgramEXT_remap_index 549
-#define UseShaderProgramEXT_remap_index 550
-#define TextureBarrierNV_remap_index 551
-#define StencilFuncSeparateATI_remap_index 552
-#define ProgramEnvParameters4fvEXT_remap_index 553
-#define ProgramLocalParameters4fvEXT_remap_index 554
-#define GetQueryObjecti64vEXT_remap_index 555
-#define GetQueryObjectui64vEXT_remap_index 556
-#define EGLImageTargetRenderbufferStorageOES_remap_index 557
-#define EGLImageTargetTexture2DOES_remap_index 558
+#define TexStorage1D_remap_index 277
+#define TexStorage2D_remap_index 278
+#define TexStorage3D_remap_index 279
+#define TextureStorage1DEXT_remap_index 280
+#define TextureStorage2DEXT_remap_index 281
+#define TextureStorage3DEXT_remap_index 282
+#define PolygonOffsetEXT_remap_index 283
+#define GetPixelTexGenParameterfvSGIS_remap_index 284
+#define GetPixelTexGenParameterivSGIS_remap_index 285
+#define PixelTexGenParameterfSGIS_remap_index 286
+#define PixelTexGenParameterfvSGIS_remap_index 287
+#define PixelTexGenParameteriSGIS_remap_index 288
+#define PixelTexGenParameterivSGIS_remap_index 289
+#define SampleMaskSGIS_remap_index 290
+#define SamplePatternSGIS_remap_index 291
+#define ColorPointerEXT_remap_index 292
+#define EdgeFlagPointerEXT_remap_index 293
+#define IndexPointerEXT_remap_index 294
+#define NormalPointerEXT_remap_index 295
+#define TexCoordPointerEXT_remap_index 296
+#define VertexPointerEXT_remap_index 297
+#define PointParameterfEXT_remap_index 298
+#define PointParameterfvEXT_remap_index 299
+#define LockArraysEXT_remap_index 300
+#define UnlockArraysEXT_remap_index 301
+#define SecondaryColor3bEXT_remap_index 302
+#define SecondaryColor3bvEXT_remap_index 303
+#define SecondaryColor3dEXT_remap_index 304
+#define SecondaryColor3dvEXT_remap_index 305
+#define SecondaryColor3fEXT_remap_index 306
+#define SecondaryColor3fvEXT_remap_index 307
+#define SecondaryColor3iEXT_remap_index 308
+#define SecondaryColor3ivEXT_remap_index 309
+#define SecondaryColor3sEXT_remap_index 310
+#define SecondaryColor3svEXT_remap_index 311
+#define SecondaryColor3ubEXT_remap_index 312
+#define SecondaryColor3ubvEXT_remap_index 313
+#define SecondaryColor3uiEXT_remap_index 314
+#define SecondaryColor3uivEXT_remap_index 315
+#define SecondaryColor3usEXT_remap_index 316
+#define SecondaryColor3usvEXT_remap_index 317
+#define SecondaryColorPointerEXT_remap_index 318
+#define MultiDrawArraysEXT_remap_index 319
+#define MultiDrawElementsEXT_remap_index 320
+#define FogCoordPointerEXT_remap_index 321
+#define FogCoorddEXT_remap_index 322
+#define FogCoorddvEXT_remap_index 323
+#define FogCoordfEXT_remap_index 324
+#define FogCoordfvEXT_remap_index 325
+#define PixelTexGenSGIX_remap_index 326
+#define BlendFuncSeparateEXT_remap_index 327
+#define FlushVertexArrayRangeNV_remap_index 328
+#define VertexArrayRangeNV_remap_index 329
+#define CombinerInputNV_remap_index 330
+#define CombinerOutputNV_remap_index 331
+#define CombinerParameterfNV_remap_index 332
+#define CombinerParameterfvNV_remap_index 333
+#define CombinerParameteriNV_remap_index 334
+#define CombinerParameterivNV_remap_index 335
+#define FinalCombinerInputNV_remap_index 336
+#define GetCombinerInputParameterfvNV_remap_index 337
+#define GetCombinerInputParameterivNV_remap_index 338
+#define GetCombinerOutputParameterfvNV_remap_index 339
+#define GetCombinerOutputParameterivNV_remap_index 340
+#define GetFinalCombinerInputParameterfvNV_remap_index 341
+#define GetFinalCombinerInputParameterivNV_remap_index 342
+#define ResizeBuffersMESA_remap_index 343
+#define WindowPos2dMESA_remap_index 344
+#define WindowPos2dvMESA_remap_index 345
+#define WindowPos2fMESA_remap_index 346
+#define WindowPos2fvMESA_remap_index 347
+#define WindowPos2iMESA_remap_index 348
+#define WindowPos2ivMESA_remap_index 349
+#define WindowPos2sMESA_remap_index 350
+#define WindowPos2svMESA_remap_index 351
+#define WindowPos3dMESA_remap_index 352
+#define WindowPos3dvMESA_remap_index 353
+#define WindowPos3fMESA_remap_index 354
+#define WindowPos3fvMESA_remap_index 355
+#define WindowPos3iMESA_remap_index 356
+#define WindowPos3ivMESA_remap_index 357
+#define WindowPos3sMESA_remap_index 358
+#define WindowPos3svMESA_remap_index 359
+#define WindowPos4dMESA_remap_index 360
+#define WindowPos4dvMESA_remap_index 361
+#define WindowPos4fMESA_remap_index 362
+#define WindowPos4fvMESA_remap_index 363
+#define WindowPos4iMESA_remap_index 364
+#define WindowPos4ivMESA_remap_index 365
+#define WindowPos4sMESA_remap_index 366
+#define WindowPos4svMESA_remap_index 367
+#define MultiModeDrawArraysIBM_remap_index 368
+#define MultiModeDrawElementsIBM_remap_index 369
+#define DeleteFencesNV_remap_index 370
+#define FinishFenceNV_remap_index 371
+#define GenFencesNV_remap_index 372
+#define GetFenceivNV_remap_index 373
+#define IsFenceNV_remap_index 374
+#define SetFenceNV_remap_index 375
+#define TestFenceNV_remap_index 376
+#define AreProgramsResidentNV_remap_index 377
+#define BindProgramNV_remap_index 378
+#define DeleteProgramsNV_remap_index 379
+#define ExecuteProgramNV_remap_index 380
+#define GenProgramsNV_remap_index 381
+#define GetProgramParameterdvNV_remap_index 382
+#define GetProgramParameterfvNV_remap_index 383
+#define GetProgramStringNV_remap_index 384
+#define GetProgramivNV_remap_index 385
+#define GetTrackMatrixivNV_remap_index 386
+#define GetVertexAttribPointervNV_remap_index 387
+#define GetVertexAttribdvNV_remap_index 388
+#define GetVertexAttribfvNV_remap_index 389
+#define GetVertexAttribivNV_remap_index 390
+#define IsProgramNV_remap_index 391
+#define LoadProgramNV_remap_index 392
+#define ProgramParameters4dvNV_remap_index 393
+#define ProgramParameters4fvNV_remap_index 394
+#define RequestResidentProgramsNV_remap_index 395
+#define TrackMatrixNV_remap_index 396
+#define VertexAttrib1dNV_remap_index 397
+#define VertexAttrib1dvNV_remap_index 398
+#define VertexAttrib1fNV_remap_index 399
+#define VertexAttrib1fvNV_remap_index 400
+#define VertexAttrib1sNV_remap_index 401
+#define VertexAttrib1svNV_remap_index 402
+#define VertexAttrib2dNV_remap_index 403
+#define VertexAttrib2dvNV_remap_index 404
+#define VertexAttrib2fNV_remap_index 405
+#define VertexAttrib2fvNV_remap_index 406
+#define VertexAttrib2sNV_remap_index 407
+#define VertexAttrib2svNV_remap_index 408
+#define VertexAttrib3dNV_remap_index 409
+#define VertexAttrib3dvNV_remap_index 410
+#define VertexAttrib3fNV_remap_index 411
+#define VertexAttrib3fvNV_remap_index 412
+#define VertexAttrib3sNV_remap_index 413
+#define VertexAttrib3svNV_remap_index 414
+#define VertexAttrib4dNV_remap_index 415
+#define VertexAttrib4dvNV_remap_index 416
+#define VertexAttrib4fNV_remap_index 417
+#define VertexAttrib4fvNV_remap_index 418
+#define VertexAttrib4sNV_remap_index 419
+#define VertexAttrib4svNV_remap_index 420
+#define VertexAttrib4ubNV_remap_index 421
+#define VertexAttrib4ubvNV_remap_index 422
+#define VertexAttribPointerNV_remap_index 423
+#define VertexAttribs1dvNV_remap_index 424
+#define VertexAttribs1fvNV_remap_index 425
+#define VertexAttribs1svNV_remap_index 426
+#define VertexAttribs2dvNV_remap_index 427
+#define VertexAttribs2fvNV_remap_index 428
+#define VertexAttribs2svNV_remap_index 429
+#define VertexAttribs3dvNV_remap_index 430
+#define VertexAttribs3fvNV_remap_index 431
+#define VertexAttribs3svNV_remap_index 432
+#define VertexAttribs4dvNV_remap_index 433
+#define VertexAttribs4fvNV_remap_index 434
+#define VertexAttribs4svNV_remap_index 435
+#define VertexAttribs4ubvNV_remap_index 436
+#define GetTexBumpParameterfvATI_remap_index 437
+#define GetTexBumpParameterivATI_remap_index 438
+#define TexBumpParameterfvATI_remap_index 439
+#define TexBumpParameterivATI_remap_index 440
+#define AlphaFragmentOp1ATI_remap_index 441
+#define AlphaFragmentOp2ATI_remap_index 442
+#define AlphaFragmentOp3ATI_remap_index 443
+#define BeginFragmentShaderATI_remap_index 444
+#define BindFragmentShaderATI_remap_index 445
+#define ColorFragmentOp1ATI_remap_index 446
+#define ColorFragmentOp2ATI_remap_index 447
+#define ColorFragmentOp3ATI_remap_index 448
+#define DeleteFragmentShaderATI_remap_index 449
+#define EndFragmentShaderATI_remap_index 450
+#define GenFragmentShadersATI_remap_index 451
+#define PassTexCoordATI_remap_index 452
+#define SampleMapATI_remap_index 453
+#define SetFragmentShaderConstantATI_remap_index 454
+#define PointParameteriNV_remap_index 455
+#define PointParameterivNV_remap_index 456
+#define ActiveStencilFaceEXT_remap_index 457
+#define BindVertexArrayAPPLE_remap_index 458
+#define DeleteVertexArraysAPPLE_remap_index 459
+#define GenVertexArraysAPPLE_remap_index 460
+#define IsVertexArrayAPPLE_remap_index 461
+#define GetProgramNamedParameterdvNV_remap_index 462
+#define GetProgramNamedParameterfvNV_remap_index 463
+#define ProgramNamedParameter4dNV_remap_index 464
+#define ProgramNamedParameter4dvNV_remap_index 465
+#define ProgramNamedParameter4fNV_remap_index 466
+#define ProgramNamedParameter4fvNV_remap_index 467
+#define PrimitiveRestartIndexNV_remap_index 468
+#define PrimitiveRestartNV_remap_index 469
+#define DepthBoundsEXT_remap_index 470
+#define BlendEquationSeparateEXT_remap_index 471
+#define BindFramebufferEXT_remap_index 472
+#define BindRenderbufferEXT_remap_index 473
+#define CheckFramebufferStatusEXT_remap_index 474
+#define DeleteFramebuffersEXT_remap_index 475
+#define DeleteRenderbuffersEXT_remap_index 476
+#define FramebufferRenderbufferEXT_remap_index 477
+#define FramebufferTexture1DEXT_remap_index 478
+#define FramebufferTexture2DEXT_remap_index 479
+#define FramebufferTexture3DEXT_remap_index 480
+#define GenFramebuffersEXT_remap_index 481
+#define GenRenderbuffersEXT_remap_index 482
+#define GenerateMipmapEXT_remap_index 483
+#define GetFramebufferAttachmentParameterivEXT_remap_index 484
+#define GetRenderbufferParameterivEXT_remap_index 485
+#define IsFramebufferEXT_remap_index 486
+#define IsRenderbufferEXT_remap_index 487
+#define RenderbufferStorageEXT_remap_index 488
+#define BlitFramebufferEXT_remap_index 489
+#define BufferParameteriAPPLE_remap_index 490
+#define FlushMappedBufferRangeAPPLE_remap_index 491
+#define BindFragDataLocationEXT_remap_index 492
+#define GetFragDataLocationEXT_remap_index 493
+#define GetUniformuivEXT_remap_index 494
+#define GetVertexAttribIivEXT_remap_index 495
+#define GetVertexAttribIuivEXT_remap_index 496
+#define Uniform1uiEXT_remap_index 497
+#define Uniform1uivEXT_remap_index 498
+#define Uniform2uiEXT_remap_index 499
+#define Uniform2uivEXT_remap_index 500
+#define Uniform3uiEXT_remap_index 501
+#define Uniform3uivEXT_remap_index 502
+#define Uniform4uiEXT_remap_index 503
+#define Uniform4uivEXT_remap_index 504
+#define VertexAttribI1iEXT_remap_index 505
+#define VertexAttribI1ivEXT_remap_index 506
+#define VertexAttribI1uiEXT_remap_index 507
+#define VertexAttribI1uivEXT_remap_index 508
+#define VertexAttribI2iEXT_remap_index 509
+#define VertexAttribI2ivEXT_remap_index 510
+#define VertexAttribI2uiEXT_remap_index 511
+#define VertexAttribI2uivEXT_remap_index 512
+#define VertexAttribI3iEXT_remap_index 513
+#define VertexAttribI3ivEXT_remap_index 514
+#define VertexAttribI3uiEXT_remap_index 515
+#define VertexAttribI3uivEXT_remap_index 516
+#define VertexAttribI4bvEXT_remap_index 517
+#define VertexAttribI4iEXT_remap_index 518
+#define VertexAttribI4ivEXT_remap_index 519
+#define VertexAttribI4svEXT_remap_index 520
+#define VertexAttribI4ubvEXT_remap_index 521
+#define VertexAttribI4uiEXT_remap_index 522
+#define VertexAttribI4uivEXT_remap_index 523
+#define VertexAttribI4usvEXT_remap_index 524
+#define VertexAttribIPointerEXT_remap_index 525
+#define FramebufferTextureLayerEXT_remap_index 526
+#define ColorMaskIndexedEXT_remap_index 527
+#define DisableIndexedEXT_remap_index 528
+#define EnableIndexedEXT_remap_index 529
+#define GetBooleanIndexedvEXT_remap_index 530
+#define GetIntegerIndexedvEXT_remap_index 531
+#define IsEnabledIndexedEXT_remap_index 532
+#define ClearColorIiEXT_remap_index 533
+#define ClearColorIuiEXT_remap_index 534
+#define GetTexParameterIivEXT_remap_index 535
+#define GetTexParameterIuivEXT_remap_index 536
+#define TexParameterIivEXT_remap_index 537
+#define TexParameterIuivEXT_remap_index 538
+#define BeginConditionalRenderNV_remap_index 539
+#define EndConditionalRenderNV_remap_index 540
+#define BeginTransformFeedbackEXT_remap_index 541
+#define BindBufferBaseEXT_remap_index 542
+#define BindBufferOffsetEXT_remap_index 543
+#define BindBufferRangeEXT_remap_index 544
+#define EndTransformFeedbackEXT_remap_index 545
+#define GetTransformFeedbackVaryingEXT_remap_index 546
+#define TransformFeedbackVaryingsEXT_remap_index 547
+#define ProvokingVertexEXT_remap_index 548
+#define GetTexParameterPointervAPPLE_remap_index 549
+#define TextureRangeAPPLE_remap_index 550
+#define GetObjectParameterivAPPLE_remap_index 551
+#define ObjectPurgeableAPPLE_remap_index 552
+#define ObjectUnpurgeableAPPLE_remap_index 553
+#define ActiveProgramEXT_remap_index 554
+#define CreateShaderProgramEXT_remap_index 555
+#define UseShaderProgramEXT_remap_index 556
+#define TextureBarrierNV_remap_index 557
+#define StencilFuncSeparateATI_remap_index 558
+#define ProgramEnvParameters4fvEXT_remap_index 559
+#define ProgramLocalParameters4fvEXT_remap_index 560
+#define GetQueryObjecti64vEXT_remap_index 561
+#define GetQueryObjectui64vEXT_remap_index 562
+#define EGLImageTargetRenderbufferStorageOES_remap_index 563
+#define EGLImageTargetTexture2DOES_remap_index 564
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1874,6 +1886,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_GetnUniformivARB driDispatchRemapTable[GetnUniformivARB_remap_index]
 #define _gloffset_GetnUniformuivARB driDispatchRemapTable[GetnUniformuivARB_remap_index]
 #define _gloffset_ReadnPixelsARB driDispatchRemapTable[ReadnPixelsARB_remap_index]
+#define _gloffset_TexStorage1D driDispatchRemapTable[TexStorage1D_remap_index]
+#define _gloffset_TexStorage2D driDispatchRemapTable[TexStorage2D_remap_index]
+#define _gloffset_TexStorage3D driDispatchRemapTable[TexStorage3D_remap_index]
+#define _gloffset_TextureStorage1DEXT driDispatchRemapTable[TextureStorage1DEXT_remap_index]
+#define _gloffset_TextureStorage2DEXT driDispatchRemapTable[TextureStorage2DEXT_remap_index]
+#define _gloffset_TextureStorage3DEXT driDispatchRemapTable[TextureStorage3DEXT_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
 #define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
@@ -9694,6 +9712,72 @@ static INLINE void SET_ReadnPixelsARB(struct _glapi_table *disp, void (GLAPIENTR
    SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_TexStorage1D)(GLenum, GLsizei, GLenum, GLsizei);
+#define CALL_TexStorage1D(disp, parameters) \
+    (* GET_TexStorage1D(disp)) parameters
+static INLINE _glptr_TexStorage1D GET_TexStorage1D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D));
+}
+
+static INLINE void SET_TexStorage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TexStorage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexStorage2D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_TexStorage2D(disp, parameters) \
+    (* GET_TexStorage2D(disp)) parameters
+static INLINE _glptr_TexStorage2D GET_TexStorage2D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D));
+}
+
+static INLINE void SET_TexStorage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TexStorage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
+#define CALL_TexStorage3D(disp, parameters) \
+    (* GET_TexStorage3D(disp)) parameters
+static INLINE _glptr_TexStorage3D GET_TexStorage3D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D));
+}
+
+static INLINE void SET_TexStorage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TexStorage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei);
+#define CALL_TextureStorage1DEXT(disp, parameters) \
+    (* GET_TextureStorage1DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage1DEXT GET_TextureStorage1DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage1DEXT) (GET_by_offset(disp, _gloffset_TextureStorage1DEXT));
+}
+
+static INLINE void SET_TextureStorage1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TextureStorage1DEXT, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_TextureStorage2DEXT(disp, parameters) \
+    (* GET_TextureStorage2DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage2DEXT GET_TextureStorage2DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage2DEXT) (GET_by_offset(disp, _gloffset_TextureStorage2DEXT));
+}
+
+static INLINE void SET_TextureStorage2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TextureStorage2DEXT, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
+#define CALL_TextureStorage3DEXT(disp, parameters) \
+    (* GET_TextureStorage3DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage3DEXT GET_TextureStorage3DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage3DEXT) (GET_by_offset(disp, _gloffset_TextureStorage3DEXT));
+}
+
+static INLINE void SET_TextureStorage3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_TextureStorage3DEXT, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT)(GLfloat, GLfloat);
 #define CALL_PolygonOffsetEXT(disp, parameters) \
     (* GET_PolygonOffsetEXT(disp)) parameters