Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/src/OpenDis.c
	libX11/src/xcb_io.c
	xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
	xorg-server/xkeyboard-config/semantics/default.in

1 files changed, 325 insertions, 321 deletions

diff --git a/mesalib/src/mapi/glapi/glapi_sparc.S b/mesalib/src/mapi/glapi/glapi_sparc.S
index 004ea9f22..fd5f90fd6 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -860,41 +860,37 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetShaderPrecisionFormat, 662)
 	GL_STUB(glReleaseShaderCompiler, 663)
 	GL_STUB(glShaderBinary, 664)
-	GL_STUB(glGetGraphicsResetStatusARB, 665)
-	GL_STUB(glGetnColorTableARB, 666)
-	GL_STUB(glGetnCompressedTexImageARB, 667)
-	GL_STUB(glGetnConvolutionFilterARB, 668)
-	GL_STUB(glGetnHistogramARB, 669)
-	GL_STUB(glGetnMapdvARB, 670)
-	GL_STUB(glGetnMapfvARB, 671)
-	GL_STUB(glGetnMapivARB, 672)
-	GL_STUB(glGetnMinmaxARB, 673)
-	GL_STUB(glGetnPixelMapfvARB, 674)
-	GL_STUB(glGetnPixelMapuivARB, 675)
-	GL_STUB(glGetnPixelMapusvARB, 676)
-	GL_STUB(glGetnPolygonStippleARB, 677)
-	GL_STUB(glGetnSeparableFilterARB, 678)
-	GL_STUB(glGetnTexImageARB, 679)
-	GL_STUB(glGetnUniformdvARB, 680)
-	GL_STUB(glGetnUniformfvARB, 681)
-	GL_STUB(glGetnUniformivARB, 682)
-	GL_STUB(glGetnUniformuivARB, 683)
-	GL_STUB(glReadnPixelsARB, 684)
-	GL_STUB(glTexStorage1D, 685)
-	GL_STUB(glTexStorage2D, 686)
-	GL_STUB(glTexStorage3D, 687)
-	GL_STUB(glTextureStorage1DEXT, 688)
-	GL_STUB(glTextureStorage2DEXT, 689)
-	GL_STUB(glTextureStorage3DEXT, 690)
-	GL_STUB(glPolygonOffsetEXT, 691)
-	GL_STUB(gl_dispatch_stub_692, 692)
-	HIDDEN(gl_dispatch_stub_692)
-	GL_STUB(gl_dispatch_stub_693, 693)
-	HIDDEN(gl_dispatch_stub_693)
-	GL_STUB(gl_dispatch_stub_694, 694)
-	HIDDEN(gl_dispatch_stub_694)
-	GL_STUB(gl_dispatch_stub_695, 695)
-	HIDDEN(gl_dispatch_stub_695)
+	GL_STUB(glDebugMessageCallbackARB, 665)
+	GL_STUB(glDebugMessageControlARB, 666)
+	GL_STUB(glDebugMessageInsertARB, 667)
+	GL_STUB(glGetDebugMessageLogARB, 668)
+	GL_STUB(glGetGraphicsResetStatusARB, 669)
+	GL_STUB(glGetnColorTableARB, 670)
+	GL_STUB(glGetnCompressedTexImageARB, 671)
+	GL_STUB(glGetnConvolutionFilterARB, 672)
+	GL_STUB(glGetnHistogramARB, 673)
+	GL_STUB(glGetnMapdvARB, 674)
+	GL_STUB(glGetnMapfvARB, 675)
+	GL_STUB(glGetnMapivARB, 676)
+	GL_STUB(glGetnMinmaxARB, 677)
+	GL_STUB(glGetnPixelMapfvARB, 678)
+	GL_STUB(glGetnPixelMapuivARB, 679)
+	GL_STUB(glGetnPixelMapusvARB, 680)
+	GL_STUB(glGetnPolygonStippleARB, 681)
+	GL_STUB(glGetnSeparableFilterARB, 682)
+	GL_STUB(glGetnTexImageARB, 683)
+	GL_STUB(glGetnUniformdvARB, 684)
+	GL_STUB(glGetnUniformfvARB, 685)
+	GL_STUB(glGetnUniformivARB, 686)
+	GL_STUB(glGetnUniformuivARB, 687)
+	GL_STUB(glReadnPixelsARB, 688)
+	GL_STUB(glTexStorage1D, 689)
+	GL_STUB(glTexStorage2D, 690)
+	GL_STUB(glTexStorage3D, 691)
+	GL_STUB(glTextureStorage1DEXT, 692)
+	GL_STUB(glTextureStorage2DEXT, 693)
+	GL_STUB(glTextureStorage3DEXT, 694)
+	GL_STUB(glPolygonOffsetEXT, 695)
 	GL_STUB(gl_dispatch_stub_696, 696)
 	HIDDEN(gl_dispatch_stub_696)
 	GL_STUB(gl_dispatch_stub_697, 697)
@@ -903,91 +899,91 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_698)
 	GL_STUB(gl_dispatch_stub_699, 699)
 	HIDDEN(gl_dispatch_stub_699)
-	GL_STUB(glColorPointerEXT, 700)
-	GL_STUB(glEdgeFlagPointerEXT, 701)
-	GL_STUB(glIndexPointerEXT, 702)
-	GL_STUB(glNormalPointerEXT, 703)
-	GL_STUB(glTexCoordPointerEXT, 704)
-	GL_STUB(glVertexPointerEXT, 705)
-	GL_STUB(glPointParameterfEXT, 706)
-	GL_STUB(glPointParameterfvEXT, 707)
-	GL_STUB(glLockArraysEXT, 708)
-	GL_STUB(glUnlockArraysEXT, 709)
-	GL_STUB(glSecondaryColor3bEXT, 710)
-	GL_STUB(glSecondaryColor3bvEXT, 711)
-	GL_STUB(glSecondaryColor3dEXT, 712)
-	GL_STUB(glSecondaryColor3dvEXT, 713)
-	GL_STUB(glSecondaryColor3fEXT, 714)
-	GL_STUB(glSecondaryColor3fvEXT, 715)
-	GL_STUB(glSecondaryColor3iEXT, 716)
-	GL_STUB(glSecondaryColor3ivEXT, 717)
-	GL_STUB(glSecondaryColor3sEXT, 718)
-	GL_STUB(glSecondaryColor3svEXT, 719)
-	GL_STUB(glSecondaryColor3ubEXT, 720)
-	GL_STUB(glSecondaryColor3ubvEXT, 721)
-	GL_STUB(glSecondaryColor3uiEXT, 722)
-	GL_STUB(glSecondaryColor3uivEXT, 723)
-	GL_STUB(glSecondaryColor3usEXT, 724)
-	GL_STUB(glSecondaryColor3usvEXT, 725)
-	GL_STUB(glSecondaryColorPointerEXT, 726)
-	GL_STUB(glMultiDrawArraysEXT, 727)
-	GL_STUB(glMultiDrawElementsEXT, 728)
-	GL_STUB(glFogCoordPointerEXT, 729)
-	GL_STUB(glFogCoorddEXT, 730)
-	GL_STUB(glFogCoorddvEXT, 731)
-	GL_STUB(glFogCoordfEXT, 732)
-	GL_STUB(glFogCoordfvEXT, 733)
-	GL_STUB(gl_dispatch_stub_734, 734)
-	HIDDEN(gl_dispatch_stub_734)
-	GL_STUB(glBlendFuncSeparateEXT, 735)
-	GL_STUB(glFlushVertexArrayRangeNV, 736)
-	GL_STUB(glVertexArrayRangeNV, 737)
-	GL_STUB(glCombinerInputNV, 738)
-	GL_STUB(glCombinerOutputNV, 739)
-	GL_STUB(glCombinerParameterfNV, 740)
-	GL_STUB(glCombinerParameterfvNV, 741)
-	GL_STUB(glCombinerParameteriNV, 742)
-	GL_STUB(glCombinerParameterivNV, 743)
-	GL_STUB(glFinalCombinerInputNV, 744)
-	GL_STUB(glGetCombinerInputParameterfvNV, 745)
-	GL_STUB(glGetCombinerInputParameterivNV, 746)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 747)
-	GL_STUB(glGetCombinerOutputParameterivNV, 748)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 749)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 750)
-	GL_STUB(glResizeBuffersMESA, 751)
-	GL_STUB(glWindowPos2dMESA, 752)
-	GL_STUB(glWindowPos2dvMESA, 753)
-	GL_STUB(glWindowPos2fMESA, 754)
-	GL_STUB(glWindowPos2fvMESA, 755)
-	GL_STUB(glWindowPos2iMESA, 756)
-	GL_STUB(glWindowPos2ivMESA, 757)
-	GL_STUB(glWindowPos2sMESA, 758)
-	GL_STUB(glWindowPos2svMESA, 759)
-	GL_STUB(glWindowPos3dMESA, 760)
-	GL_STUB(glWindowPos3dvMESA, 761)
-	GL_STUB(glWindowPos3fMESA, 762)
-	GL_STUB(glWindowPos3fvMESA, 763)
-	GL_STUB(glWindowPos3iMESA, 764)
-	GL_STUB(glWindowPos3ivMESA, 765)
-	GL_STUB(glWindowPos3sMESA, 766)
-	GL_STUB(glWindowPos3svMESA, 767)
-	GL_STUB(glWindowPos4dMESA, 768)
-	GL_STUB(glWindowPos4dvMESA, 769)
-	GL_STUB(glWindowPos4fMESA, 770)
-	GL_STUB(glWindowPos4fvMESA, 771)
-	GL_STUB(glWindowPos4iMESA, 772)
-	GL_STUB(glWindowPos4ivMESA, 773)
-	GL_STUB(glWindowPos4sMESA, 774)
-	GL_STUB(glWindowPos4svMESA, 775)
-	GL_STUB(gl_dispatch_stub_776, 776)
-	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, 777)
-	HIDDEN(gl_dispatch_stub_777)
-	GL_STUB(gl_dispatch_stub_778, 778)
-	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, 779)
-	HIDDEN(gl_dispatch_stub_779)
+	GL_STUB(gl_dispatch_stub_700, 700)
+	HIDDEN(gl_dispatch_stub_700)
+	GL_STUB(gl_dispatch_stub_701, 701)
+	HIDDEN(gl_dispatch_stub_701)
+	GL_STUB(gl_dispatch_stub_702, 702)
+	HIDDEN(gl_dispatch_stub_702)
+	GL_STUB(gl_dispatch_stub_703, 703)
+	HIDDEN(gl_dispatch_stub_703)
+	GL_STUB(glColorPointerEXT, 704)
+	GL_STUB(glEdgeFlagPointerEXT, 705)
+	GL_STUB(glIndexPointerEXT, 706)
+	GL_STUB(glNormalPointerEXT, 707)
+	GL_STUB(glTexCoordPointerEXT, 708)
+	GL_STUB(glVertexPointerEXT, 709)
+	GL_STUB(glPointParameterfEXT, 710)
+	GL_STUB(glPointParameterfvEXT, 711)
+	GL_STUB(glLockArraysEXT, 712)
+	GL_STUB(glUnlockArraysEXT, 713)
+	GL_STUB(glSecondaryColor3bEXT, 714)
+	GL_STUB(glSecondaryColor3bvEXT, 715)
+	GL_STUB(glSecondaryColor3dEXT, 716)
+	GL_STUB(glSecondaryColor3dvEXT, 717)
+	GL_STUB(glSecondaryColor3fEXT, 718)
+	GL_STUB(glSecondaryColor3fvEXT, 719)
+	GL_STUB(glSecondaryColor3iEXT, 720)
+	GL_STUB(glSecondaryColor3ivEXT, 721)
+	GL_STUB(glSecondaryColor3sEXT, 722)
+	GL_STUB(glSecondaryColor3svEXT, 723)
+	GL_STUB(glSecondaryColor3ubEXT, 724)
+	GL_STUB(glSecondaryColor3ubvEXT, 725)
+	GL_STUB(glSecondaryColor3uiEXT, 726)
+	GL_STUB(glSecondaryColor3uivEXT, 727)
+	GL_STUB(glSecondaryColor3usEXT, 728)
+	GL_STUB(glSecondaryColor3usvEXT, 729)
+	GL_STUB(glSecondaryColorPointerEXT, 730)
+	GL_STUB(glMultiDrawArraysEXT, 731)
+	GL_STUB(glMultiDrawElementsEXT, 732)
+	GL_STUB(glFogCoordPointerEXT, 733)
+	GL_STUB(glFogCoorddEXT, 734)
+	GL_STUB(glFogCoorddvEXT, 735)
+	GL_STUB(glFogCoordfEXT, 736)
+	GL_STUB(glFogCoordfvEXT, 737)
+	GL_STUB(gl_dispatch_stub_738, 738)
+	HIDDEN(gl_dispatch_stub_738)
+	GL_STUB(glBlendFuncSeparateEXT, 739)
+	GL_STUB(glFlushVertexArrayRangeNV, 740)
+	GL_STUB(glVertexArrayRangeNV, 741)
+	GL_STUB(glCombinerInputNV, 742)
+	GL_STUB(glCombinerOutputNV, 743)
+	GL_STUB(glCombinerParameterfNV, 744)
+	GL_STUB(glCombinerParameterfvNV, 745)
+	GL_STUB(glCombinerParameteriNV, 746)
+	GL_STUB(glCombinerParameterivNV, 747)
+	GL_STUB(glFinalCombinerInputNV, 748)
+	GL_STUB(glGetCombinerInputParameterfvNV, 749)
+	GL_STUB(glGetCombinerInputParameterivNV, 750)
+	GL_STUB(glGetCombinerOutputParameterfvNV, 751)
+	GL_STUB(glGetCombinerOutputParameterivNV, 752)
+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 753)
+	GL_STUB(glGetFinalCombinerInputParameterivNV, 754)
+	GL_STUB(glResizeBuffersMESA, 755)
+	GL_STUB(glWindowPos2dMESA, 756)
+	GL_STUB(glWindowPos2dvMESA, 757)
+	GL_STUB(glWindowPos2fMESA, 758)
+	GL_STUB(glWindowPos2fvMESA, 759)
+	GL_STUB(glWindowPos2iMESA, 760)
+	GL_STUB(glWindowPos2ivMESA, 761)
+	GL_STUB(glWindowPos2sMESA, 762)
+	GL_STUB(glWindowPos2svMESA, 763)
+	GL_STUB(glWindowPos3dMESA, 764)
+	GL_STUB(glWindowPos3dvMESA, 765)
+	GL_STUB(glWindowPos3fMESA, 766)
+	GL_STUB(glWindowPos3fvMESA, 767)
+	GL_STUB(glWindowPos3iMESA, 768)
+	GL_STUB(glWindowPos3ivMESA, 769)
+	GL_STUB(glWindowPos3sMESA, 770)
+	GL_STUB(glWindowPos3svMESA, 771)
+	GL_STUB(glWindowPos4dMESA, 772)
+	GL_STUB(glWindowPos4dvMESA, 773)
+	GL_STUB(glWindowPos4fMESA, 774)
+	GL_STUB(glWindowPos4fvMESA, 775)
+	GL_STUB(glWindowPos4iMESA, 776)
+	GL_STUB(glWindowPos4ivMESA, 777)
+	GL_STUB(glWindowPos4sMESA, 778)
+	GL_STUB(glWindowPos4svMESA, 779)
 	GL_STUB(gl_dispatch_stub_780, 780)
 	HIDDEN(gl_dispatch_stub_780)
 	GL_STUB(gl_dispatch_stub_781, 781)
@@ -998,211 +994,219 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_783)
 	GL_STUB(gl_dispatch_stub_784, 784)
 	HIDDEN(gl_dispatch_stub_784)
-	GL_STUB(glAreProgramsResidentNV, 785)
-	GL_STUB(glBindProgramNV, 786)
-	GL_STUB(glDeleteProgramsNV, 787)
-	GL_STUB(glExecuteProgramNV, 788)
-	GL_STUB(glGenProgramsNV, 789)
-	GL_STUB(glGetProgramParameterdvNV, 790)
-	GL_STUB(glGetProgramParameterfvNV, 791)
-	GL_STUB(glGetProgramStringNV, 792)
-	GL_STUB(glGetProgramivNV, 793)
-	GL_STUB(glGetTrackMatrixivNV, 794)
-	GL_STUB(glGetVertexAttribPointervNV, 795)
-	GL_STUB(glGetVertexAttribdvNV, 796)
-	GL_STUB(glGetVertexAttribfvNV, 797)
-	GL_STUB(glGetVertexAttribivNV, 798)
-	GL_STUB(glIsProgramNV, 799)
-	GL_STUB(glLoadProgramNV, 800)
-	GL_STUB(glProgramParameters4dvNV, 801)
-	GL_STUB(glProgramParameters4fvNV, 802)
-	GL_STUB(glRequestResidentProgramsNV, 803)
-	GL_STUB(glTrackMatrixNV, 804)
-	GL_STUB(glVertexAttrib1dNV, 805)
-	GL_STUB(glVertexAttrib1dvNV, 806)
-	GL_STUB(glVertexAttrib1fNV, 807)
-	GL_STUB(glVertexAttrib1fvNV, 808)
-	GL_STUB(glVertexAttrib1sNV, 809)
-	GL_STUB(glVertexAttrib1svNV, 810)
-	GL_STUB(glVertexAttrib2dNV, 811)
-	GL_STUB(glVertexAttrib2dvNV, 812)
-	GL_STUB(glVertexAttrib2fNV, 813)
-	GL_STUB(glVertexAttrib2fvNV, 814)
-	GL_STUB(glVertexAttrib2sNV, 815)
-	GL_STUB(glVertexAttrib2svNV, 816)
-	GL_STUB(glVertexAttrib3dNV, 817)
-	GL_STUB(glVertexAttrib3dvNV, 818)
-	GL_STUB(glVertexAttrib3fNV, 819)
-	GL_STUB(glVertexAttrib3fvNV, 820)
-	GL_STUB(glVertexAttrib3sNV, 821)
-	GL_STUB(glVertexAttrib3svNV, 822)
-	GL_STUB(glVertexAttrib4dNV, 823)
-	GL_STUB(glVertexAttrib4dvNV, 824)
-	GL_STUB(glVertexAttrib4fNV, 825)
-	GL_STUB(glVertexAttrib4fvNV, 826)
-	GL_STUB(glVertexAttrib4sNV, 827)
-	GL_STUB(glVertexAttrib4svNV, 828)
-	GL_STUB(glVertexAttrib4ubNV, 829)
-	GL_STUB(glVertexAttrib4ubvNV, 830)
-	GL_STUB(glVertexAttribPointerNV, 831)
-	GL_STUB(glVertexAttribs1dvNV, 832)
-	GL_STUB(glVertexAttribs1fvNV, 833)
-	GL_STUB(glVertexAttribs1svNV, 834)
-	GL_STUB(glVertexAttribs2dvNV, 835)
-	GL_STUB(glVertexAttribs2fvNV, 836)
-	GL_STUB(glVertexAttribs2svNV, 837)
-	GL_STUB(glVertexAttribs3dvNV, 838)
-	GL_STUB(glVertexAttribs3fvNV, 839)
-	GL_STUB(glVertexAttribs3svNV, 840)
-	GL_STUB(glVertexAttribs4dvNV, 841)
-	GL_STUB(glVertexAttribs4fvNV, 842)
-	GL_STUB(glVertexAttribs4svNV, 843)
-	GL_STUB(glVertexAttribs4ubvNV, 844)
-	GL_STUB(glGetTexBumpParameterfvATI, 845)
-	GL_STUB(glGetTexBumpParameterivATI, 846)
-	GL_STUB(glTexBumpParameterfvATI, 847)
-	GL_STUB(glTexBumpParameterivATI, 848)
-	GL_STUB(glAlphaFragmentOp1ATI, 849)
-	GL_STUB(glAlphaFragmentOp2ATI, 850)
-	GL_STUB(glAlphaFragmentOp3ATI, 851)
-	GL_STUB(glBeginFragmentShaderATI, 852)
-	GL_STUB(glBindFragmentShaderATI, 853)
-	GL_STUB(glColorFragmentOp1ATI, 854)
-	GL_STUB(glColorFragmentOp2ATI, 855)
-	GL_STUB(glColorFragmentOp3ATI, 856)
-	GL_STUB(glDeleteFragmentShaderATI, 857)
-	GL_STUB(glEndFragmentShaderATI, 858)
-	GL_STUB(glGenFragmentShadersATI, 859)
-	GL_STUB(glPassTexCoordATI, 860)
-	GL_STUB(glSampleMapATI, 861)
-	GL_STUB(glSetFragmentShaderConstantATI, 862)
-	GL_STUB(glPointParameteriNV, 863)
-	GL_STUB(glPointParameterivNV, 864)
-	GL_STUB(gl_dispatch_stub_865, 865)
-	HIDDEN(gl_dispatch_stub_865)
-	GL_STUB(gl_dispatch_stub_866, 866)
-	HIDDEN(gl_dispatch_stub_866)
-	GL_STUB(gl_dispatch_stub_867, 867)
-	HIDDEN(gl_dispatch_stub_867)
-	GL_STUB(gl_dispatch_stub_868, 868)
-	HIDDEN(gl_dispatch_stub_868)
+	GL_STUB(gl_dispatch_stub_785, 785)
+	HIDDEN(gl_dispatch_stub_785)
+	GL_STUB(gl_dispatch_stub_786, 786)
+	HIDDEN(gl_dispatch_stub_786)
+	GL_STUB(gl_dispatch_stub_787, 787)
+	HIDDEN(gl_dispatch_stub_787)
+	GL_STUB(gl_dispatch_stub_788, 788)
+	HIDDEN(gl_dispatch_stub_788)
+	GL_STUB(glAreProgramsResidentNV, 789)
+	GL_STUB(glBindProgramNV, 790)
+	GL_STUB(glDeleteProgramsNV, 791)
+	GL_STUB(glExecuteProgramNV, 792)
+	GL_STUB(glGenProgramsNV, 793)
+	GL_STUB(glGetProgramParameterdvNV, 794)
+	GL_STUB(glGetProgramParameterfvNV, 795)
+	GL_STUB(glGetProgramStringNV, 796)
+	GL_STUB(glGetProgramivNV, 797)
+	GL_STUB(glGetTrackMatrixivNV, 798)
+	GL_STUB(glGetVertexAttribPointervNV, 799)
+	GL_STUB(glGetVertexAttribdvNV, 800)
+	GL_STUB(glGetVertexAttribfvNV, 801)
+	GL_STUB(glGetVertexAttribivNV, 802)
+	GL_STUB(glIsProgramNV, 803)
+	GL_STUB(glLoadProgramNV, 804)
+	GL_STUB(glProgramParameters4dvNV, 805)
+	GL_STUB(glProgramParameters4fvNV, 806)
+	GL_STUB(glRequestResidentProgramsNV, 807)
+	GL_STUB(glTrackMatrixNV, 808)
+	GL_STUB(glVertexAttrib1dNV, 809)
+	GL_STUB(glVertexAttrib1dvNV, 810)
+	GL_STUB(glVertexAttrib1fNV, 811)
+	GL_STUB(glVertexAttrib1fvNV, 812)
+	GL_STUB(glVertexAttrib1sNV, 813)
+	GL_STUB(glVertexAttrib1svNV, 814)
+	GL_STUB(glVertexAttrib2dNV, 815)
+	GL_STUB(glVertexAttrib2dvNV, 816)
+	GL_STUB(glVertexAttrib2fNV, 817)
+	GL_STUB(glVertexAttrib2fvNV, 818)
+	GL_STUB(glVertexAttrib2sNV, 819)
+	GL_STUB(glVertexAttrib2svNV, 820)
+	GL_STUB(glVertexAttrib3dNV, 821)
+	GL_STUB(glVertexAttrib3dvNV, 822)
+	GL_STUB(glVertexAttrib3fNV, 823)
+	GL_STUB(glVertexAttrib3fvNV, 824)
+	GL_STUB(glVertexAttrib3sNV, 825)
+	GL_STUB(glVertexAttrib3svNV, 826)
+	GL_STUB(glVertexAttrib4dNV, 827)
+	GL_STUB(glVertexAttrib4dvNV, 828)
+	GL_STUB(glVertexAttrib4fNV, 829)
+	GL_STUB(glVertexAttrib4fvNV, 830)
+	GL_STUB(glVertexAttrib4sNV, 831)
+	GL_STUB(glVertexAttrib4svNV, 832)
+	GL_STUB(glVertexAttrib4ubNV, 833)
+	GL_STUB(glVertexAttrib4ubvNV, 834)
+	GL_STUB(glVertexAttribPointerNV, 835)
+	GL_STUB(glVertexAttribs1dvNV, 836)
+	GL_STUB(glVertexAttribs1fvNV, 837)
+	GL_STUB(glVertexAttribs1svNV, 838)
+	GL_STUB(glVertexAttribs2dvNV, 839)
+	GL_STUB(glVertexAttribs2fvNV, 840)
+	GL_STUB(glVertexAttribs2svNV, 841)
+	GL_STUB(glVertexAttribs3dvNV, 842)
+	GL_STUB(glVertexAttribs3fvNV, 843)
+	GL_STUB(glVertexAttribs3svNV, 844)
+	GL_STUB(glVertexAttribs4dvNV, 845)
+	GL_STUB(glVertexAttribs4fvNV, 846)
+	GL_STUB(glVertexAttribs4svNV, 847)
+	GL_STUB(glVertexAttribs4ubvNV, 848)
+	GL_STUB(glGetTexBumpParameterfvATI, 849)
+	GL_STUB(glGetTexBumpParameterivATI, 850)
+	GL_STUB(glTexBumpParameterfvATI, 851)
+	GL_STUB(glTexBumpParameterivATI, 852)
+	GL_STUB(glAlphaFragmentOp1ATI, 853)
+	GL_STUB(glAlphaFragmentOp2ATI, 854)
+	GL_STUB(glAlphaFragmentOp3ATI, 855)
+	GL_STUB(glBeginFragmentShaderATI, 856)
+	GL_STUB(glBindFragmentShaderATI, 857)
+	GL_STUB(glColorFragmentOp1ATI, 858)
+	GL_STUB(glColorFragmentOp2ATI, 859)
+	GL_STUB(glColorFragmentOp3ATI, 860)
+	GL_STUB(glDeleteFragmentShaderATI, 861)
+	GL_STUB(glEndFragmentShaderATI, 862)
+	GL_STUB(glGenFragmentShadersATI, 863)
+	GL_STUB(glPassTexCoordATI, 864)
+	GL_STUB(glSampleMapATI, 865)
+	GL_STUB(glSetFragmentShaderConstantATI, 866)
+	GL_STUB(glPointParameteriNV, 867)
+	GL_STUB(glPointParameterivNV, 868)
 	GL_STUB(gl_dispatch_stub_869, 869)
 	HIDDEN(gl_dispatch_stub_869)
-	GL_STUB(glGetProgramNamedParameterdvNV, 870)
-	GL_STUB(glGetProgramNamedParameterfvNV, 871)
-	GL_STUB(glProgramNamedParameter4dNV, 872)
-	GL_STUB(glProgramNamedParameter4dvNV, 873)
-	GL_STUB(glProgramNamedParameter4fNV, 874)
-	GL_STUB(glProgramNamedParameter4fvNV, 875)
-	GL_STUB(glPrimitiveRestartIndexNV, 876)
-	GL_STUB(glPrimitiveRestartNV, 877)
-	GL_STUB(gl_dispatch_stub_878, 878)
-	HIDDEN(gl_dispatch_stub_878)
-	GL_STUB(gl_dispatch_stub_879, 879)
-	HIDDEN(gl_dispatch_stub_879)
-	GL_STUB(glBindFramebufferEXT, 880)
-	GL_STUB(glBindRenderbufferEXT, 881)
-	GL_STUB(glCheckFramebufferStatusEXT, 882)
-	GL_STUB(glDeleteFramebuffersEXT, 883)
-	GL_STUB(glDeleteRenderbuffersEXT, 884)
-	GL_STUB(glFramebufferRenderbufferEXT, 885)
-	GL_STUB(glFramebufferTexture1DEXT, 886)
-	GL_STUB(glFramebufferTexture2DEXT, 887)
-	GL_STUB(glFramebufferTexture3DEXT, 888)
-	GL_STUB(glGenFramebuffersEXT, 889)
-	GL_STUB(glGenRenderbuffersEXT, 890)
-	GL_STUB(glGenerateMipmapEXT, 891)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 892)
-	GL_STUB(glGetRenderbufferParameterivEXT, 893)
-	GL_STUB(glIsFramebufferEXT, 894)
-	GL_STUB(glIsRenderbufferEXT, 895)
-	GL_STUB(glRenderbufferStorageEXT, 896)
-	GL_STUB(gl_dispatch_stub_897, 897)
-	HIDDEN(gl_dispatch_stub_897)
-	GL_STUB(gl_dispatch_stub_898, 898)
-	HIDDEN(gl_dispatch_stub_898)
-	GL_STUB(gl_dispatch_stub_899, 899)
-	HIDDEN(gl_dispatch_stub_899)
-	GL_STUB(glBindFragDataLocationEXT, 900)
-	GL_STUB(glGetFragDataLocationEXT, 901)
-	GL_STUB(glGetUniformuivEXT, 902)
-	GL_STUB(glGetVertexAttribIivEXT, 903)
-	GL_STUB(glGetVertexAttribIuivEXT, 904)
-	GL_STUB(glUniform1uiEXT, 905)
-	GL_STUB(glUniform1uivEXT, 906)
-	GL_STUB(glUniform2uiEXT, 907)
-	GL_STUB(glUniform2uivEXT, 908)
-	GL_STUB(glUniform3uiEXT, 909)
-	GL_STUB(glUniform3uivEXT, 910)
-	GL_STUB(glUniform4uiEXT, 911)
-	GL_STUB(glUniform4uivEXT, 912)
-	GL_STUB(glVertexAttribI1iEXT, 913)
-	GL_STUB(glVertexAttribI1ivEXT, 914)
-	GL_STUB(glVertexAttribI1uiEXT, 915)
-	GL_STUB(glVertexAttribI1uivEXT, 916)
-	GL_STUB(glVertexAttribI2iEXT, 917)
-	GL_STUB(glVertexAttribI2ivEXT, 918)
-	GL_STUB(glVertexAttribI2uiEXT, 919)
-	GL_STUB(glVertexAttribI2uivEXT, 920)
-	GL_STUB(glVertexAttribI3iEXT, 921)
-	GL_STUB(glVertexAttribI3ivEXT, 922)
-	GL_STUB(glVertexAttribI3uiEXT, 923)
-	GL_STUB(glVertexAttribI3uivEXT, 924)
-	GL_STUB(glVertexAttribI4bvEXT, 925)
-	GL_STUB(glVertexAttribI4iEXT, 926)
-	GL_STUB(glVertexAttribI4ivEXT, 927)
-	GL_STUB(glVertexAttribI4svEXT, 928)
-	GL_STUB(glVertexAttribI4ubvEXT, 929)
-	GL_STUB(glVertexAttribI4uiEXT, 930)
-	GL_STUB(glVertexAttribI4uivEXT, 931)
-	GL_STUB(glVertexAttribI4usvEXT, 932)
-	GL_STUB(glVertexAttribIPointerEXT, 933)
-	GL_STUB(glFramebufferTextureLayerEXT, 934)
-	GL_STUB(glColorMaskIndexedEXT, 935)
-	GL_STUB(glDisableIndexedEXT, 936)
-	GL_STUB(glEnableIndexedEXT, 937)
-	GL_STUB(glGetBooleanIndexedvEXT, 938)
-	GL_STUB(glGetIntegerIndexedvEXT, 939)
-	GL_STUB(glIsEnabledIndexedEXT, 940)
-	GL_STUB(glClearColorIiEXT, 941)
-	GL_STUB(glClearColorIuiEXT, 942)
-	GL_STUB(glGetTexParameterIivEXT, 943)
-	GL_STUB(glGetTexParameterIuivEXT, 944)
-	GL_STUB(glTexParameterIivEXT, 945)
-	GL_STUB(glTexParameterIuivEXT, 946)
-	GL_STUB(glBeginConditionalRenderNV, 947)
-	GL_STUB(glEndConditionalRenderNV, 948)
-	GL_STUB(glBeginTransformFeedbackEXT, 949)
-	GL_STUB(glBindBufferBaseEXT, 950)
-	GL_STUB(glBindBufferOffsetEXT, 951)
-	GL_STUB(glBindBufferRangeEXT, 952)
-	GL_STUB(glEndTransformFeedbackEXT, 953)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 954)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 955)
-	GL_STUB(glProvokingVertexEXT, 956)
-	GL_STUB(gl_dispatch_stub_957, 957)
-	HIDDEN(gl_dispatch_stub_957)
-	GL_STUB(gl_dispatch_stub_958, 958)
-	HIDDEN(gl_dispatch_stub_958)
-	GL_STUB(glGetObjectParameterivAPPLE, 959)
-	GL_STUB(glObjectPurgeableAPPLE, 960)
-	GL_STUB(glObjectUnpurgeableAPPLE, 961)
-	GL_STUB(glActiveProgramEXT, 962)
-	GL_STUB(glCreateShaderProgramEXT, 963)
-	GL_STUB(glUseShaderProgramEXT, 964)
-	GL_STUB(glTextureBarrierNV, 965)
-	GL_STUB(gl_dispatch_stub_966, 966)
-	HIDDEN(gl_dispatch_stub_966)
-	GL_STUB(gl_dispatch_stub_967, 967)
-	HIDDEN(gl_dispatch_stub_967)
-	GL_STUB(gl_dispatch_stub_968, 968)
-	HIDDEN(gl_dispatch_stub_968)
-	GL_STUB(gl_dispatch_stub_969, 969)
-	HIDDEN(gl_dispatch_stub_969)
+	GL_STUB(gl_dispatch_stub_870, 870)
+	HIDDEN(gl_dispatch_stub_870)
+	GL_STUB(gl_dispatch_stub_871, 871)
+	HIDDEN(gl_dispatch_stub_871)
+	GL_STUB(gl_dispatch_stub_872, 872)
+	HIDDEN(gl_dispatch_stub_872)
+	GL_STUB(gl_dispatch_stub_873, 873)
+	HIDDEN(gl_dispatch_stub_873)
+	GL_STUB(glGetProgramNamedParameterdvNV, 874)
+	GL_STUB(glGetProgramNamedParameterfvNV, 875)
+	GL_STUB(glProgramNamedParameter4dNV, 876)
+	GL_STUB(glProgramNamedParameter4dvNV, 877)
+	GL_STUB(glProgramNamedParameter4fNV, 878)
+	GL_STUB(glProgramNamedParameter4fvNV, 879)
+	GL_STUB(glPrimitiveRestartIndexNV, 880)
+	GL_STUB(glPrimitiveRestartNV, 881)
+	GL_STUB(gl_dispatch_stub_882, 882)
+	HIDDEN(gl_dispatch_stub_882)
+	GL_STUB(gl_dispatch_stub_883, 883)
+	HIDDEN(gl_dispatch_stub_883)
+	GL_STUB(glBindFramebufferEXT, 884)
+	GL_STUB(glBindRenderbufferEXT, 885)
+	GL_STUB(glCheckFramebufferStatusEXT, 886)
+	GL_STUB(glDeleteFramebuffersEXT, 887)
+	GL_STUB(glDeleteRenderbuffersEXT, 888)
+	GL_STUB(glFramebufferRenderbufferEXT, 889)
+	GL_STUB(glFramebufferTexture1DEXT, 890)
+	GL_STUB(glFramebufferTexture2DEXT, 891)
+	GL_STUB(glFramebufferTexture3DEXT, 892)
+	GL_STUB(glGenFramebuffersEXT, 893)
+	GL_STUB(glGenRenderbuffersEXT, 894)
+	GL_STUB(glGenerateMipmapEXT, 895)
+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 896)
+	GL_STUB(glGetRenderbufferParameterivEXT, 897)
+	GL_STUB(glIsFramebufferEXT, 898)
+	GL_STUB(glIsRenderbufferEXT, 899)
+	GL_STUB(glRenderbufferStorageEXT, 900)
+	GL_STUB(gl_dispatch_stub_901, 901)
+	HIDDEN(gl_dispatch_stub_901)
+	GL_STUB(gl_dispatch_stub_902, 902)
+	HIDDEN(gl_dispatch_stub_902)
+	GL_STUB(gl_dispatch_stub_903, 903)
+	HIDDEN(gl_dispatch_stub_903)
+	GL_STUB(glBindFragDataLocationEXT, 904)
+	GL_STUB(glGetFragDataLocationEXT, 905)
+	GL_STUB(glGetUniformuivEXT, 906)
+	GL_STUB(glGetVertexAttribIivEXT, 907)
+	GL_STUB(glGetVertexAttribIuivEXT, 908)
+	GL_STUB(glUniform1uiEXT, 909)
+	GL_STUB(glUniform1uivEXT, 910)
+	GL_STUB(glUniform2uiEXT, 911)
+	GL_STUB(glUniform2uivEXT, 912)
+	GL_STUB(glUniform3uiEXT, 913)
+	GL_STUB(glUniform3uivEXT, 914)
+	GL_STUB(glUniform4uiEXT, 915)
+	GL_STUB(glUniform4uivEXT, 916)
+	GL_STUB(glVertexAttribI1iEXT, 917)
+	GL_STUB(glVertexAttribI1ivEXT, 918)
+	GL_STUB(glVertexAttribI1uiEXT, 919)
+	GL_STUB(glVertexAttribI1uivEXT, 920)
+	GL_STUB(glVertexAttribI2iEXT, 921)
+	GL_STUB(glVertexAttribI2ivEXT, 922)
+	GL_STUB(glVertexAttribI2uiEXT, 923)
+	GL_STUB(glVertexAttribI2uivEXT, 924)
+	GL_STUB(glVertexAttribI3iEXT, 925)
+	GL_STUB(glVertexAttribI3ivEXT, 926)
+	GL_STUB(glVertexAttribI3uiEXT, 927)
+	GL_STUB(glVertexAttribI3uivEXT, 928)
+	GL_STUB(glVertexAttribI4bvEXT, 929)
+	GL_STUB(glVertexAttribI4iEXT, 930)
+	GL_STUB(glVertexAttribI4ivEXT, 931)
+	GL_STUB(glVertexAttribI4svEXT, 932)
+	GL_STUB(glVertexAttribI4ubvEXT, 933)
+	GL_STUB(glVertexAttribI4uiEXT, 934)
+	GL_STUB(glVertexAttribI4uivEXT, 935)
+	GL_STUB(glVertexAttribI4usvEXT, 936)
+	GL_STUB(glVertexAttribIPointerEXT, 937)
+	GL_STUB(glFramebufferTextureLayerEXT, 938)
+	GL_STUB(glColorMaskIndexedEXT, 939)
+	GL_STUB(glDisableIndexedEXT, 940)
+	GL_STUB(glEnableIndexedEXT, 941)
+	GL_STUB(glGetBooleanIndexedvEXT, 942)
+	GL_STUB(glGetIntegerIndexedvEXT, 943)
+	GL_STUB(glIsEnabledIndexedEXT, 944)
+	GL_STUB(glClearColorIiEXT, 945)
+	GL_STUB(glClearColorIuiEXT, 946)
+	GL_STUB(glGetTexParameterIivEXT, 947)
+	GL_STUB(glGetTexParameterIuivEXT, 948)
+	GL_STUB(glTexParameterIivEXT, 949)
+	GL_STUB(glTexParameterIuivEXT, 950)
+	GL_STUB(glBeginConditionalRenderNV, 951)
+	GL_STUB(glEndConditionalRenderNV, 952)
+	GL_STUB(glBeginTransformFeedbackEXT, 953)
+	GL_STUB(glBindBufferBaseEXT, 954)
+	GL_STUB(glBindBufferOffsetEXT, 955)
+	GL_STUB(glBindBufferRangeEXT, 956)
+	GL_STUB(glEndTransformFeedbackEXT, 957)
+	GL_STUB(glGetTransformFeedbackVaryingEXT, 958)
+	GL_STUB(glTransformFeedbackVaryingsEXT, 959)
+	GL_STUB(glProvokingVertexEXT, 960)
+	GL_STUB(gl_dispatch_stub_961, 961)
+	HIDDEN(gl_dispatch_stub_961)
+	GL_STUB(gl_dispatch_stub_962, 962)
+	HIDDEN(gl_dispatch_stub_962)
+	GL_STUB(glGetObjectParameterivAPPLE, 963)
+	GL_STUB(glObjectPurgeableAPPLE, 964)
+	GL_STUB(glObjectUnpurgeableAPPLE, 965)
+	GL_STUB(glActiveProgramEXT, 966)
+	GL_STUB(glCreateShaderProgramEXT, 967)
+	GL_STUB(glUseShaderProgramEXT, 968)
+	GL_STUB(glTextureBarrierNV, 969)
 	GL_STUB(gl_dispatch_stub_970, 970)
 	HIDDEN(gl_dispatch_stub_970)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 971)
-	GL_STUB(glEGLImageTargetTexture2DOES, 972)
+	GL_STUB(gl_dispatch_stub_971, 971)
+	HIDDEN(gl_dispatch_stub_971)
+	GL_STUB(gl_dispatch_stub_972, 972)
+	HIDDEN(gl_dispatch_stub_972)
+	GL_STUB(gl_dispatch_stub_973, 973)
+	HIDDEN(gl_dispatch_stub_973)
+	GL_STUB(gl_dispatch_stub_974, 974)
+	HIDDEN(gl_dispatch_stub_974)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 975)
+	GL_STUB(glEGLImageTargetTexture2DOES, 976)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)