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, 313 insertions, 307 deletions

diff --git a/mesalib/src/mapi/glapi/glapi_sparc.S b/mesalib/src/mapi/glapi/glapi_sparc.S
index 15b9e8737..004ea9f22 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -880,323 +880,329 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetnUniformivARB, 682)
 	GL_STUB(glGetnUniformuivARB, 683)
 	GL_STUB(glReadnPixelsARB, 684)
-	GL_STUB(glPolygonOffsetEXT, 685)
-	GL_STUB(gl_dispatch_stub_686, 686)
-	HIDDEN(gl_dispatch_stub_686)
-	GL_STUB(gl_dispatch_stub_687, 687)
-	HIDDEN(gl_dispatch_stub_687)
-	GL_STUB(gl_dispatch_stub_688, 688)
-	HIDDEN(gl_dispatch_stub_688)
-	GL_STUB(gl_dispatch_stub_689, 689)
-	HIDDEN(gl_dispatch_stub_689)
-	GL_STUB(gl_dispatch_stub_690, 690)
-	HIDDEN(gl_dispatch_stub_690)
-	GL_STUB(gl_dispatch_stub_691, 691)
-	HIDDEN(gl_dispatch_stub_691)
+	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(glColorPointerEXT, 694)
-	GL_STUB(glEdgeFlagPointerEXT, 695)
-	GL_STUB(glIndexPointerEXT, 696)
-	GL_STUB(glNormalPointerEXT, 697)
-	GL_STUB(glTexCoordPointerEXT, 698)
-	GL_STUB(glVertexPointerEXT, 699)
-	GL_STUB(glPointParameterfEXT, 700)
-	GL_STUB(glPointParameterfvEXT, 701)
-	GL_STUB(glLockArraysEXT, 702)
-	GL_STUB(glUnlockArraysEXT, 703)
-	GL_STUB(glSecondaryColor3bEXT, 704)
-	GL_STUB(glSecondaryColor3bvEXT, 705)
-	GL_STUB(glSecondaryColor3dEXT, 706)
-	GL_STUB(glSecondaryColor3dvEXT, 707)
-	GL_STUB(glSecondaryColor3fEXT, 708)
-	GL_STUB(glSecondaryColor3fvEXT, 709)
-	GL_STUB(glSecondaryColor3iEXT, 710)
-	GL_STUB(glSecondaryColor3ivEXT, 711)
-	GL_STUB(glSecondaryColor3sEXT, 712)
-	GL_STUB(glSecondaryColor3svEXT, 713)
-	GL_STUB(glSecondaryColor3ubEXT, 714)
-	GL_STUB(glSecondaryColor3ubvEXT, 715)
-	GL_STUB(glSecondaryColor3uiEXT, 716)
-	GL_STUB(glSecondaryColor3uivEXT, 717)
-	GL_STUB(glSecondaryColor3usEXT, 718)
-	GL_STUB(glSecondaryColor3usvEXT, 719)
-	GL_STUB(glSecondaryColorPointerEXT, 720)
-	GL_STUB(glMultiDrawArraysEXT, 721)
-	GL_STUB(glMultiDrawElementsEXT, 722)
-	GL_STUB(glFogCoordPointerEXT, 723)
-	GL_STUB(glFogCoorddEXT, 724)
-	GL_STUB(glFogCoorddvEXT, 725)
-	GL_STUB(glFogCoordfEXT, 726)
-	GL_STUB(glFogCoordfvEXT, 727)
-	GL_STUB(gl_dispatch_stub_728, 728)
-	HIDDEN(gl_dispatch_stub_728)
-	GL_STUB(glBlendFuncSeparateEXT, 729)
-	GL_STUB(glFlushVertexArrayRangeNV, 730)
-	GL_STUB(glVertexArrayRangeNV, 731)
-	GL_STUB(glCombinerInputNV, 732)
-	GL_STUB(glCombinerOutputNV, 733)
-	GL_STUB(glCombinerParameterfNV, 734)
-	GL_STUB(glCombinerParameterfvNV, 735)
-	GL_STUB(glCombinerParameteriNV, 736)
-	GL_STUB(glCombinerParameterivNV, 737)
-	GL_STUB(glFinalCombinerInputNV, 738)
-	GL_STUB(glGetCombinerInputParameterfvNV, 739)
-	GL_STUB(glGetCombinerInputParameterivNV, 740)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 741)
-	GL_STUB(glGetCombinerOutputParameterivNV, 742)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 743)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 744)
-	GL_STUB(glResizeBuffersMESA, 745)
-	GL_STUB(glWindowPos2dMESA, 746)
-	GL_STUB(glWindowPos2dvMESA, 747)
-	GL_STUB(glWindowPos2fMESA, 748)
-	GL_STUB(glWindowPos2fvMESA, 749)
-	GL_STUB(glWindowPos2iMESA, 750)
-	GL_STUB(glWindowPos2ivMESA, 751)
-	GL_STUB(glWindowPos2sMESA, 752)
-	GL_STUB(glWindowPos2svMESA, 753)
-	GL_STUB(glWindowPos3dMESA, 754)
-	GL_STUB(glWindowPos3dvMESA, 755)
-	GL_STUB(glWindowPos3fMESA, 756)
-	GL_STUB(glWindowPos3fvMESA, 757)
-	GL_STUB(glWindowPos3iMESA, 758)
-	GL_STUB(glWindowPos3ivMESA, 759)
-	GL_STUB(glWindowPos3sMESA, 760)
-	GL_STUB(glWindowPos3svMESA, 761)
-	GL_STUB(glWindowPos4dMESA, 762)
-	GL_STUB(glWindowPos4dvMESA, 763)
-	GL_STUB(glWindowPos4fMESA, 764)
-	GL_STUB(glWindowPos4fvMESA, 765)
-	GL_STUB(glWindowPos4iMESA, 766)
-	GL_STUB(glWindowPos4ivMESA, 767)
-	GL_STUB(glWindowPos4sMESA, 768)
-	GL_STUB(glWindowPos4svMESA, 769)
-	GL_STUB(gl_dispatch_stub_770, 770)
-	HIDDEN(gl_dispatch_stub_770)
-	GL_STUB(gl_dispatch_stub_771, 771)
-	HIDDEN(gl_dispatch_stub_771)
-	GL_STUB(gl_dispatch_stub_772, 772)
-	HIDDEN(gl_dispatch_stub_772)
-	GL_STUB(gl_dispatch_stub_773, 773)
-	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, 774)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, 775)
-	HIDDEN(gl_dispatch_stub_775)
+	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(gl_dispatch_stub_696, 696)
+	HIDDEN(gl_dispatch_stub_696)
+	GL_STUB(gl_dispatch_stub_697, 697)
+	HIDDEN(gl_dispatch_stub_697)
+	GL_STUB(gl_dispatch_stub_698, 698)
+	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(glAreProgramsResidentNV, 779)
-	GL_STUB(glBindProgramNV, 780)
-	GL_STUB(glDeleteProgramsNV, 781)
-	GL_STUB(glExecuteProgramNV, 782)
-	GL_STUB(glGenProgramsNV, 783)
-	GL_STUB(glGetProgramParameterdvNV, 784)
-	GL_STUB(glGetProgramParameterfvNV, 785)
-	GL_STUB(glGetProgramStringNV, 786)
-	GL_STUB(glGetProgramivNV, 787)
-	GL_STUB(glGetTrackMatrixivNV, 788)
-	GL_STUB(glGetVertexAttribPointervNV, 789)
-	GL_STUB(glGetVertexAttribdvNV, 790)
-	GL_STUB(glGetVertexAttribfvNV, 791)
-	GL_STUB(glGetVertexAttribivNV, 792)
-	GL_STUB(glIsProgramNV, 793)
-	GL_STUB(glLoadProgramNV, 794)
-	GL_STUB(glProgramParameters4dvNV, 795)
-	GL_STUB(glProgramParameters4fvNV, 796)
-	GL_STUB(glRequestResidentProgramsNV, 797)
-	GL_STUB(glTrackMatrixNV, 798)
-	GL_STUB(glVertexAttrib1dNV, 799)
-	GL_STUB(glVertexAttrib1dvNV, 800)
-	GL_STUB(glVertexAttrib1fNV, 801)
-	GL_STUB(glVertexAttrib1fvNV, 802)
-	GL_STUB(glVertexAttrib1sNV, 803)
-	GL_STUB(glVertexAttrib1svNV, 804)
-	GL_STUB(glVertexAttrib2dNV, 805)
-	GL_STUB(glVertexAttrib2dvNV, 806)
-	GL_STUB(glVertexAttrib2fNV, 807)
-	GL_STUB(glVertexAttrib2fvNV, 808)
-	GL_STUB(glVertexAttrib2sNV, 809)
-	GL_STUB(glVertexAttrib2svNV, 810)
-	GL_STUB(glVertexAttrib3dNV, 811)
-	GL_STUB(glVertexAttrib3dvNV, 812)
-	GL_STUB(glVertexAttrib3fNV, 813)
-	GL_STUB(glVertexAttrib3fvNV, 814)
-	GL_STUB(glVertexAttrib3sNV, 815)
-	GL_STUB(glVertexAttrib3svNV, 816)
-	GL_STUB(glVertexAttrib4dNV, 817)
-	GL_STUB(glVertexAttrib4dvNV, 818)
-	GL_STUB(glVertexAttrib4fNV, 819)
-	GL_STUB(glVertexAttrib4fvNV, 820)
-	GL_STUB(glVertexAttrib4sNV, 821)
-	GL_STUB(glVertexAttrib4svNV, 822)
-	GL_STUB(glVertexAttrib4ubNV, 823)
-	GL_STUB(glVertexAttrib4ubvNV, 824)
-	GL_STUB(glVertexAttribPointerNV, 825)
-	GL_STUB(glVertexAttribs1dvNV, 826)
-	GL_STUB(glVertexAttribs1fvNV, 827)
-	GL_STUB(glVertexAttribs1svNV, 828)
-	GL_STUB(glVertexAttribs2dvNV, 829)
-	GL_STUB(glVertexAttribs2fvNV, 830)
-	GL_STUB(glVertexAttribs2svNV, 831)
-	GL_STUB(glVertexAttribs3dvNV, 832)
-	GL_STUB(glVertexAttribs3fvNV, 833)
-	GL_STUB(glVertexAttribs3svNV, 834)
-	GL_STUB(glVertexAttribs4dvNV, 835)
-	GL_STUB(glVertexAttribs4fvNV, 836)
-	GL_STUB(glVertexAttribs4svNV, 837)
-	GL_STUB(glVertexAttribs4ubvNV, 838)
-	GL_STUB(glGetTexBumpParameterfvATI, 839)
-	GL_STUB(glGetTexBumpParameterivATI, 840)
-	GL_STUB(glTexBumpParameterfvATI, 841)
-	GL_STUB(glTexBumpParameterivATI, 842)
-	GL_STUB(glAlphaFragmentOp1ATI, 843)
-	GL_STUB(glAlphaFragmentOp2ATI, 844)
-	GL_STUB(glAlphaFragmentOp3ATI, 845)
-	GL_STUB(glBeginFragmentShaderATI, 846)
-	GL_STUB(glBindFragmentShaderATI, 847)
-	GL_STUB(glColorFragmentOp1ATI, 848)
-	GL_STUB(glColorFragmentOp2ATI, 849)
-	GL_STUB(glColorFragmentOp3ATI, 850)
-	GL_STUB(glDeleteFragmentShaderATI, 851)
-	GL_STUB(glEndFragmentShaderATI, 852)
-	GL_STUB(glGenFragmentShadersATI, 853)
-	GL_STUB(glPassTexCoordATI, 854)
-	GL_STUB(glSampleMapATI, 855)
-	GL_STUB(glSetFragmentShaderConstantATI, 856)
-	GL_STUB(glPointParameteriNV, 857)
-	GL_STUB(glPointParameterivNV, 858)
-	GL_STUB(gl_dispatch_stub_859, 859)
-	HIDDEN(gl_dispatch_stub_859)
-	GL_STUB(gl_dispatch_stub_860, 860)
-	HIDDEN(gl_dispatch_stub_860)
-	GL_STUB(gl_dispatch_stub_861, 861)
-	HIDDEN(gl_dispatch_stub_861)
-	GL_STUB(gl_dispatch_stub_862, 862)
-	HIDDEN(gl_dispatch_stub_862)
-	GL_STUB(gl_dispatch_stub_863, 863)
-	HIDDEN(gl_dispatch_stub_863)
-	GL_STUB(glGetProgramNamedParameterdvNV, 864)
-	GL_STUB(glGetProgramNamedParameterfvNV, 865)
-	GL_STUB(glProgramNamedParameter4dNV, 866)
-	GL_STUB(glProgramNamedParameter4dvNV, 867)
-	GL_STUB(glProgramNamedParameter4fNV, 868)
-	GL_STUB(glProgramNamedParameter4fvNV, 869)
-	GL_STUB(glPrimitiveRestartIndexNV, 870)
-	GL_STUB(glPrimitiveRestartNV, 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(glBindFramebufferEXT, 874)
-	GL_STUB(glBindRenderbufferEXT, 875)
-	GL_STUB(glCheckFramebufferStatusEXT, 876)
-	GL_STUB(glDeleteFramebuffersEXT, 877)
-	GL_STUB(glDeleteRenderbuffersEXT, 878)
-	GL_STUB(glFramebufferRenderbufferEXT, 879)
-	GL_STUB(glFramebufferTexture1DEXT, 880)
-	GL_STUB(glFramebufferTexture2DEXT, 881)
-	GL_STUB(glFramebufferTexture3DEXT, 882)
-	GL_STUB(glGenFramebuffersEXT, 883)
-	GL_STUB(glGenRenderbuffersEXT, 884)
-	GL_STUB(glGenerateMipmapEXT, 885)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 886)
-	GL_STUB(glGetRenderbufferParameterivEXT, 887)
-	GL_STUB(glIsFramebufferEXT, 888)
-	GL_STUB(glIsRenderbufferEXT, 889)
-	GL_STUB(glRenderbufferStorageEXT, 890)
-	GL_STUB(gl_dispatch_stub_891, 891)
-	HIDDEN(gl_dispatch_stub_891)
-	GL_STUB(gl_dispatch_stub_892, 892)
-	HIDDEN(gl_dispatch_stub_892)
-	GL_STUB(gl_dispatch_stub_893, 893)
-	HIDDEN(gl_dispatch_stub_893)
-	GL_STUB(glBindFragDataLocationEXT, 894)
-	GL_STUB(glGetFragDataLocationEXT, 895)
-	GL_STUB(glGetUniformuivEXT, 896)
-	GL_STUB(glGetVertexAttribIivEXT, 897)
-	GL_STUB(glGetVertexAttribIuivEXT, 898)
-	GL_STUB(glUniform1uiEXT, 899)
-	GL_STUB(glUniform1uivEXT, 900)
-	GL_STUB(glUniform2uiEXT, 901)
-	GL_STUB(glUniform2uivEXT, 902)
-	GL_STUB(glUniform3uiEXT, 903)
-	GL_STUB(glUniform3uivEXT, 904)
-	GL_STUB(glUniform4uiEXT, 905)
-	GL_STUB(glUniform4uivEXT, 906)
-	GL_STUB(glVertexAttribI1iEXT, 907)
-	GL_STUB(glVertexAttribI1ivEXT, 908)
-	GL_STUB(glVertexAttribI1uiEXT, 909)
-	GL_STUB(glVertexAttribI1uivEXT, 910)
-	GL_STUB(glVertexAttribI2iEXT, 911)
-	GL_STUB(glVertexAttribI2ivEXT, 912)
-	GL_STUB(glVertexAttribI2uiEXT, 913)
-	GL_STUB(glVertexAttribI2uivEXT, 914)
-	GL_STUB(glVertexAttribI3iEXT, 915)
-	GL_STUB(glVertexAttribI3ivEXT, 916)
-	GL_STUB(glVertexAttribI3uiEXT, 917)
-	GL_STUB(glVertexAttribI3uivEXT, 918)
-	GL_STUB(glVertexAttribI4bvEXT, 919)
-	GL_STUB(glVertexAttribI4iEXT, 920)
-	GL_STUB(glVertexAttribI4ivEXT, 921)
-	GL_STUB(glVertexAttribI4svEXT, 922)
-	GL_STUB(glVertexAttribI4ubvEXT, 923)
-	GL_STUB(glVertexAttribI4uiEXT, 924)
-	GL_STUB(glVertexAttribI4uivEXT, 925)
-	GL_STUB(glVertexAttribI4usvEXT, 926)
-	GL_STUB(glVertexAttribIPointerEXT, 927)
-	GL_STUB(glFramebufferTextureLayerEXT, 928)
-	GL_STUB(glColorMaskIndexedEXT, 929)
-	GL_STUB(glDisableIndexedEXT, 930)
-	GL_STUB(glEnableIndexedEXT, 931)
-	GL_STUB(glGetBooleanIndexedvEXT, 932)
-	GL_STUB(glGetIntegerIndexedvEXT, 933)
-	GL_STUB(glIsEnabledIndexedEXT, 934)
-	GL_STUB(glClearColorIiEXT, 935)
-	GL_STUB(glClearColorIuiEXT, 936)
-	GL_STUB(glGetTexParameterIivEXT, 937)
-	GL_STUB(glGetTexParameterIuivEXT, 938)
-	GL_STUB(glTexParameterIivEXT, 939)
-	GL_STUB(glTexParameterIuivEXT, 940)
-	GL_STUB(glBeginConditionalRenderNV, 941)
-	GL_STUB(glEndConditionalRenderNV, 942)
-	GL_STUB(glBeginTransformFeedbackEXT, 943)
-	GL_STUB(glBindBufferBaseEXT, 944)
-	GL_STUB(glBindBufferOffsetEXT, 945)
-	GL_STUB(glBindBufferRangeEXT, 946)
-	GL_STUB(glEndTransformFeedbackEXT, 947)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 948)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 949)
-	GL_STUB(glProvokingVertexEXT, 950)
-	GL_STUB(gl_dispatch_stub_951, 951)
-	HIDDEN(gl_dispatch_stub_951)
-	GL_STUB(gl_dispatch_stub_952, 952)
-	HIDDEN(gl_dispatch_stub_952)
-	GL_STUB(glGetObjectParameterivAPPLE, 953)
-	GL_STUB(glObjectPurgeableAPPLE, 954)
-	GL_STUB(glObjectUnpurgeableAPPLE, 955)
-	GL_STUB(glActiveProgramEXT, 956)
-	GL_STUB(glCreateShaderProgramEXT, 957)
-	GL_STUB(glUseShaderProgramEXT, 958)
-	GL_STUB(glTextureBarrierNV, 959)
-	GL_STUB(gl_dispatch_stub_960, 960)
-	HIDDEN(gl_dispatch_stub_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(gl_dispatch_stub_963, 963)
-	HIDDEN(gl_dispatch_stub_963)
-	GL_STUB(gl_dispatch_stub_964, 964)
-	HIDDEN(gl_dispatch_stub_964)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 965)
-	GL_STUB(glEGLImageTargetTexture2DOES, 966)
+	GL_STUB(gl_dispatch_stub_779, 779)
+	HIDDEN(gl_dispatch_stub_779)
+	GL_STUB(gl_dispatch_stub_780, 780)
+	HIDDEN(gl_dispatch_stub_780)
+	GL_STUB(gl_dispatch_stub_781, 781)
+	HIDDEN(gl_dispatch_stub_781)
+	GL_STUB(gl_dispatch_stub_782, 782)
+	HIDDEN(gl_dispatch_stub_782)
+	GL_STUB(gl_dispatch_stub_783, 783)
+	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_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_970, 970)
+	HIDDEN(gl_dispatch_stub_970)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 971)
+	GL_STUB(glEGLImageTargetTexture2DOES, 972)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)