Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

1 files changed, 316 insertions, 315 deletions

diff --git a/mesalib/src/mapi/glapi/glapi_sparc.S b/mesalib/src/mapi/glapi/glapi_sparc.S
index 5d6f92124..06c616481 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -789,61 +789,60 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsSync, 591)

 	GL_STUB(glWaitSync, 592)

 	GL_STUB(glDrawElementsBaseVertex, 593)

-	GL_STUB(glDrawRangeElementsBaseVertex, 594)

-	GL_STUB(glMultiDrawElementsBaseVertex, 595)

-	GL_STUB(glBlendEquationSeparateiARB, 596)

-	GL_STUB(glBlendEquationiARB, 597)

-	GL_STUB(glBlendFuncSeparateiARB, 598)

-	GL_STUB(glBlendFunciARB, 599)

-	GL_STUB(glBindSampler, 600)

-	GL_STUB(glDeleteSamplers, 601)

-	GL_STUB(glGenSamplers, 602)

-	GL_STUB(glGetSamplerParameterIiv, 603)

-	GL_STUB(glGetSamplerParameterIuiv, 604)

-	GL_STUB(glGetSamplerParameterfv, 605)

-	GL_STUB(glGetSamplerParameteriv, 606)

-	GL_STUB(glIsSampler, 607)

-	GL_STUB(glSamplerParameterIiv, 608)

-	GL_STUB(glSamplerParameterIuiv, 609)

-	GL_STUB(glSamplerParameterf, 610)

-	GL_STUB(glSamplerParameterfv, 611)

-	GL_STUB(glSamplerParameteri, 612)

-	GL_STUB(glSamplerParameteriv, 613)

-	GL_STUB(glBindTransformFeedback, 614)

-	GL_STUB(glDeleteTransformFeedbacks, 615)

-	GL_STUB(glDrawTransformFeedback, 616)

-	GL_STUB(glGenTransformFeedbacks, 617)

-	GL_STUB(glIsTransformFeedback, 618)

-	GL_STUB(glPauseTransformFeedback, 619)

-	GL_STUB(glResumeTransformFeedback, 620)

-	GL_STUB(glClearDepthf, 621)

-	GL_STUB(glDepthRangef, 622)

-	GL_STUB(glGetShaderPrecisionFormat, 623)

-	GL_STUB(glReleaseShaderCompiler, 624)

-	GL_STUB(glShaderBinary, 625)

-	GL_STUB(glGetGraphicsResetStatusARB, 626)

-	GL_STUB(glGetnColorTableARB, 627)

-	GL_STUB(glGetnCompressedTexImageARB, 628)

-	GL_STUB(glGetnConvolutionFilterARB, 629)

-	GL_STUB(glGetnHistogramARB, 630)

-	GL_STUB(glGetnMapdvARB, 631)

-	GL_STUB(glGetnMapfvARB, 632)

-	GL_STUB(glGetnMapivARB, 633)

-	GL_STUB(glGetnMinmaxARB, 634)

-	GL_STUB(glGetnPixelMapfvARB, 635)

-	GL_STUB(glGetnPixelMapuivARB, 636)

-	GL_STUB(glGetnPixelMapusvARB, 637)

-	GL_STUB(glGetnPolygonStippleARB, 638)

-	GL_STUB(glGetnSeparableFilterARB, 639)

-	GL_STUB(glGetnTexImageARB, 640)

-	GL_STUB(glGetnUniformdvARB, 641)

-	GL_STUB(glGetnUniformfvARB, 642)

-	GL_STUB(glGetnUniformivARB, 643)

-	GL_STUB(glGetnUniformuivARB, 644)

-	GL_STUB(glReadnPixelsARB, 645)

-	GL_STUB(glPolygonOffsetEXT, 646)

-	GL_STUB(gl_dispatch_stub_647, 647)

-	HIDDEN(gl_dispatch_stub_647)

+	GL_STUB(glDrawElementsInstancedBaseVertex, 594)

+	GL_STUB(glDrawRangeElementsBaseVertex, 595)

+	GL_STUB(glMultiDrawElementsBaseVertex, 596)

+	GL_STUB(glBlendEquationSeparateiARB, 597)

+	GL_STUB(glBlendEquationiARB, 598)

+	GL_STUB(glBlendFuncSeparateiARB, 599)

+	GL_STUB(glBlendFunciARB, 600)

+	GL_STUB(glBindSampler, 601)

+	GL_STUB(glDeleteSamplers, 602)

+	GL_STUB(glGenSamplers, 603)

+	GL_STUB(glGetSamplerParameterIiv, 604)

+	GL_STUB(glGetSamplerParameterIuiv, 605)

+	GL_STUB(glGetSamplerParameterfv, 606)

+	GL_STUB(glGetSamplerParameteriv, 607)

+	GL_STUB(glIsSampler, 608)

+	GL_STUB(glSamplerParameterIiv, 609)

+	GL_STUB(glSamplerParameterIuiv, 610)

+	GL_STUB(glSamplerParameterf, 611)

+	GL_STUB(glSamplerParameterfv, 612)

+	GL_STUB(glSamplerParameteri, 613)

+	GL_STUB(glSamplerParameteriv, 614)

+	GL_STUB(glBindTransformFeedback, 615)

+	GL_STUB(glDeleteTransformFeedbacks, 616)

+	GL_STUB(glDrawTransformFeedback, 617)

+	GL_STUB(glGenTransformFeedbacks, 618)

+	GL_STUB(glIsTransformFeedback, 619)

+	GL_STUB(glPauseTransformFeedback, 620)

+	GL_STUB(glResumeTransformFeedback, 621)

+	GL_STUB(glClearDepthf, 622)

+	GL_STUB(glDepthRangef, 623)

+	GL_STUB(glGetShaderPrecisionFormat, 624)

+	GL_STUB(glReleaseShaderCompiler, 625)

+	GL_STUB(glShaderBinary, 626)

+	GL_STUB(glGetGraphicsResetStatusARB, 627)

+	GL_STUB(glGetnColorTableARB, 628)

+	GL_STUB(glGetnCompressedTexImageARB, 629)

+	GL_STUB(glGetnConvolutionFilterARB, 630)

+	GL_STUB(glGetnHistogramARB, 631)

+	GL_STUB(glGetnMapdvARB, 632)

+	GL_STUB(glGetnMapfvARB, 633)

+	GL_STUB(glGetnMapivARB, 634)

+	GL_STUB(glGetnMinmaxARB, 635)

+	GL_STUB(glGetnPixelMapfvARB, 636)

+	GL_STUB(glGetnPixelMapuivARB, 637)

+	GL_STUB(glGetnPixelMapusvARB, 638)

+	GL_STUB(glGetnPolygonStippleARB, 639)

+	GL_STUB(glGetnSeparableFilterARB, 640)

+	GL_STUB(glGetnTexImageARB, 641)

+	GL_STUB(glGetnUniformdvARB, 642)

+	GL_STUB(glGetnUniformfvARB, 643)

+	GL_STUB(glGetnUniformivARB, 644)

+	GL_STUB(glGetnUniformuivARB, 645)

+	GL_STUB(glReadnPixelsARB, 646)

+	GL_STUB(glPolygonOffsetEXT, 647)

 	GL_STUB(gl_dispatch_stub_648, 648)

 	HIDDEN(gl_dispatch_stub_648)

 	GL_STUB(gl_dispatch_stub_649, 649)

@@ -858,85 +857,85 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_653)

 	GL_STUB(gl_dispatch_stub_654, 654)

 	HIDDEN(gl_dispatch_stub_654)

-	GL_STUB(glColorPointerEXT, 655)

-	GL_STUB(glEdgeFlagPointerEXT, 656)

-	GL_STUB(glIndexPointerEXT, 657)

-	GL_STUB(glNormalPointerEXT, 658)

-	GL_STUB(glTexCoordPointerEXT, 659)

-	GL_STUB(glVertexPointerEXT, 660)

-	GL_STUB(glPointParameterfEXT, 661)

-	GL_STUB(glPointParameterfvEXT, 662)

-	GL_STUB(glLockArraysEXT, 663)

-	GL_STUB(glUnlockArraysEXT, 664)

-	GL_STUB(glSecondaryColor3bEXT, 665)

-	GL_STUB(glSecondaryColor3bvEXT, 666)

-	GL_STUB(glSecondaryColor3dEXT, 667)

-	GL_STUB(glSecondaryColor3dvEXT, 668)

-	GL_STUB(glSecondaryColor3fEXT, 669)

-	GL_STUB(glSecondaryColor3fvEXT, 670)

-	GL_STUB(glSecondaryColor3iEXT, 671)

-	GL_STUB(glSecondaryColor3ivEXT, 672)

-	GL_STUB(glSecondaryColor3sEXT, 673)

-	GL_STUB(glSecondaryColor3svEXT, 674)

-	GL_STUB(glSecondaryColor3ubEXT, 675)

-	GL_STUB(glSecondaryColor3ubvEXT, 676)

-	GL_STUB(glSecondaryColor3uiEXT, 677)

-	GL_STUB(glSecondaryColor3uivEXT, 678)

-	GL_STUB(glSecondaryColor3usEXT, 679)

-	GL_STUB(glSecondaryColor3usvEXT, 680)

-	GL_STUB(glSecondaryColorPointerEXT, 681)

-	GL_STUB(glMultiDrawArraysEXT, 682)

-	GL_STUB(glMultiDrawElementsEXT, 683)

-	GL_STUB(glFogCoordPointerEXT, 684)

-	GL_STUB(glFogCoorddEXT, 685)

-	GL_STUB(glFogCoorddvEXT, 686)

-	GL_STUB(glFogCoordfEXT, 687)

-	GL_STUB(glFogCoordfvEXT, 688)

-	GL_STUB(gl_dispatch_stub_689, 689)

-	HIDDEN(gl_dispatch_stub_689)

-	GL_STUB(glBlendFuncSeparateEXT, 690)

-	GL_STUB(glFlushVertexArrayRangeNV, 691)

-	GL_STUB(glVertexArrayRangeNV, 692)

-	GL_STUB(glCombinerInputNV, 693)

-	GL_STUB(glCombinerOutputNV, 694)

-	GL_STUB(glCombinerParameterfNV, 695)

-	GL_STUB(glCombinerParameterfvNV, 696)

-	GL_STUB(glCombinerParameteriNV, 697)

-	GL_STUB(glCombinerParameterivNV, 698)

-	GL_STUB(glFinalCombinerInputNV, 699)

-	GL_STUB(glGetCombinerInputParameterfvNV, 700)

-	GL_STUB(glGetCombinerInputParameterivNV, 701)

-	GL_STUB(glGetCombinerOutputParameterfvNV, 702)

-	GL_STUB(glGetCombinerOutputParameterivNV, 703)

-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 704)

-	GL_STUB(glGetFinalCombinerInputParameterivNV, 705)

-	GL_STUB(glResizeBuffersMESA, 706)

-	GL_STUB(glWindowPos2dMESA, 707)

-	GL_STUB(glWindowPos2dvMESA, 708)

-	GL_STUB(glWindowPos2fMESA, 709)

-	GL_STUB(glWindowPos2fvMESA, 710)

-	GL_STUB(glWindowPos2iMESA, 711)

-	GL_STUB(glWindowPos2ivMESA, 712)

-	GL_STUB(glWindowPos2sMESA, 713)

-	GL_STUB(glWindowPos2svMESA, 714)

-	GL_STUB(glWindowPos3dMESA, 715)

-	GL_STUB(glWindowPos3dvMESA, 716)

-	GL_STUB(glWindowPos3fMESA, 717)

-	GL_STUB(glWindowPos3fvMESA, 718)

-	GL_STUB(glWindowPos3iMESA, 719)

-	GL_STUB(glWindowPos3ivMESA, 720)

-	GL_STUB(glWindowPos3sMESA, 721)

-	GL_STUB(glWindowPos3svMESA, 722)

-	GL_STUB(glWindowPos4dMESA, 723)

-	GL_STUB(glWindowPos4dvMESA, 724)

-	GL_STUB(glWindowPos4fMESA, 725)

-	GL_STUB(glWindowPos4fvMESA, 726)

-	GL_STUB(glWindowPos4iMESA, 727)

-	GL_STUB(glWindowPos4ivMESA, 728)

-	GL_STUB(glWindowPos4sMESA, 729)

-	GL_STUB(glWindowPos4svMESA, 730)

-	GL_STUB(gl_dispatch_stub_731, 731)

-	HIDDEN(gl_dispatch_stub_731)

+	GL_STUB(gl_dispatch_stub_655, 655)

+	HIDDEN(gl_dispatch_stub_655)

+	GL_STUB(glColorPointerEXT, 656)

+	GL_STUB(glEdgeFlagPointerEXT, 657)

+	GL_STUB(glIndexPointerEXT, 658)

+	GL_STUB(glNormalPointerEXT, 659)

+	GL_STUB(glTexCoordPointerEXT, 660)

+	GL_STUB(glVertexPointerEXT, 661)

+	GL_STUB(glPointParameterfEXT, 662)

+	GL_STUB(glPointParameterfvEXT, 663)

+	GL_STUB(glLockArraysEXT, 664)

+	GL_STUB(glUnlockArraysEXT, 665)

+	GL_STUB(glSecondaryColor3bEXT, 666)

+	GL_STUB(glSecondaryColor3bvEXT, 667)

+	GL_STUB(glSecondaryColor3dEXT, 668)

+	GL_STUB(glSecondaryColor3dvEXT, 669)

+	GL_STUB(glSecondaryColor3fEXT, 670)

+	GL_STUB(glSecondaryColor3fvEXT, 671)

+	GL_STUB(glSecondaryColor3iEXT, 672)

+	GL_STUB(glSecondaryColor3ivEXT, 673)

+	GL_STUB(glSecondaryColor3sEXT, 674)

+	GL_STUB(glSecondaryColor3svEXT, 675)

+	GL_STUB(glSecondaryColor3ubEXT, 676)

+	GL_STUB(glSecondaryColor3ubvEXT, 677)

+	GL_STUB(glSecondaryColor3uiEXT, 678)

+	GL_STUB(glSecondaryColor3uivEXT, 679)

+	GL_STUB(glSecondaryColor3usEXT, 680)

+	GL_STUB(glSecondaryColor3usvEXT, 681)

+	GL_STUB(glSecondaryColorPointerEXT, 682)

+	GL_STUB(glMultiDrawArraysEXT, 683)

+	GL_STUB(glMultiDrawElementsEXT, 684)

+	GL_STUB(glFogCoordPointerEXT, 685)

+	GL_STUB(glFogCoorddEXT, 686)

+	GL_STUB(glFogCoorddvEXT, 687)

+	GL_STUB(glFogCoordfEXT, 688)

+	GL_STUB(glFogCoordfvEXT, 689)

+	GL_STUB(gl_dispatch_stub_690, 690)

+	HIDDEN(gl_dispatch_stub_690)

+	GL_STUB(glBlendFuncSeparateEXT, 691)

+	GL_STUB(glFlushVertexArrayRangeNV, 692)

+	GL_STUB(glVertexArrayRangeNV, 693)

+	GL_STUB(glCombinerInputNV, 694)

+	GL_STUB(glCombinerOutputNV, 695)

+	GL_STUB(glCombinerParameterfNV, 696)

+	GL_STUB(glCombinerParameterfvNV, 697)

+	GL_STUB(glCombinerParameteriNV, 698)

+	GL_STUB(glCombinerParameterivNV, 699)

+	GL_STUB(glFinalCombinerInputNV, 700)

+	GL_STUB(glGetCombinerInputParameterfvNV, 701)

+	GL_STUB(glGetCombinerInputParameterivNV, 702)

+	GL_STUB(glGetCombinerOutputParameterfvNV, 703)

+	GL_STUB(glGetCombinerOutputParameterivNV, 704)

+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 705)

+	GL_STUB(glGetFinalCombinerInputParameterivNV, 706)

+	GL_STUB(glResizeBuffersMESA, 707)

+	GL_STUB(glWindowPos2dMESA, 708)

+	GL_STUB(glWindowPos2dvMESA, 709)

+	GL_STUB(glWindowPos2fMESA, 710)

+	GL_STUB(glWindowPos2fvMESA, 711)

+	GL_STUB(glWindowPos2iMESA, 712)

+	GL_STUB(glWindowPos2ivMESA, 713)

+	GL_STUB(glWindowPos2sMESA, 714)

+	GL_STUB(glWindowPos2svMESA, 715)

+	GL_STUB(glWindowPos3dMESA, 716)

+	GL_STUB(glWindowPos3dvMESA, 717)

+	GL_STUB(glWindowPos3fMESA, 718)

+	GL_STUB(glWindowPos3fvMESA, 719)

+	GL_STUB(glWindowPos3iMESA, 720)

+	GL_STUB(glWindowPos3ivMESA, 721)

+	GL_STUB(glWindowPos3sMESA, 722)

+	GL_STUB(glWindowPos3svMESA, 723)

+	GL_STUB(glWindowPos4dMESA, 724)

+	GL_STUB(glWindowPos4dvMESA, 725)

+	GL_STUB(glWindowPos4fMESA, 726)

+	GL_STUB(glWindowPos4fvMESA, 727)

+	GL_STUB(glWindowPos4iMESA, 728)

+	GL_STUB(glWindowPos4ivMESA, 729)

+	GL_STUB(glWindowPos4sMESA, 730)

+	GL_STUB(glWindowPos4svMESA, 731)

 	GL_STUB(gl_dispatch_stub_732, 732)

 	HIDDEN(gl_dispatch_stub_732)

 	GL_STUB(gl_dispatch_stub_733, 733)

@@ -953,88 +952,88 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_738)

 	GL_STUB(gl_dispatch_stub_739, 739)

 	HIDDEN(gl_dispatch_stub_739)

-	GL_STUB(glAreProgramsResidentNV, 740)

-	GL_STUB(glBindProgramNV, 741)

-	GL_STUB(glDeleteProgramsNV, 742)

-	GL_STUB(glExecuteProgramNV, 743)

-	GL_STUB(glGenProgramsNV, 744)

-	GL_STUB(glGetProgramParameterdvNV, 745)

-	GL_STUB(glGetProgramParameterfvNV, 746)

-	GL_STUB(glGetProgramStringNV, 747)

-	GL_STUB(glGetProgramivNV, 748)

-	GL_STUB(glGetTrackMatrixivNV, 749)

-	GL_STUB(glGetVertexAttribPointervNV, 750)

-	GL_STUB(glGetVertexAttribdvNV, 751)

-	GL_STUB(glGetVertexAttribfvNV, 752)

-	GL_STUB(glGetVertexAttribivNV, 753)

-	GL_STUB(glIsProgramNV, 754)

-	GL_STUB(glLoadProgramNV, 755)

-	GL_STUB(glProgramParameters4dvNV, 756)

-	GL_STUB(glProgramParameters4fvNV, 757)

-	GL_STUB(glRequestResidentProgramsNV, 758)

-	GL_STUB(glTrackMatrixNV, 759)

-	GL_STUB(glVertexAttrib1dNV, 760)

-	GL_STUB(glVertexAttrib1dvNV, 761)

-	GL_STUB(glVertexAttrib1fNV, 762)

-	GL_STUB(glVertexAttrib1fvNV, 763)

-	GL_STUB(glVertexAttrib1sNV, 764)

-	GL_STUB(glVertexAttrib1svNV, 765)

-	GL_STUB(glVertexAttrib2dNV, 766)

-	GL_STUB(glVertexAttrib2dvNV, 767)

-	GL_STUB(glVertexAttrib2fNV, 768)

-	GL_STUB(glVertexAttrib2fvNV, 769)

-	GL_STUB(glVertexAttrib2sNV, 770)

-	GL_STUB(glVertexAttrib2svNV, 771)

-	GL_STUB(glVertexAttrib3dNV, 772)

-	GL_STUB(glVertexAttrib3dvNV, 773)

-	GL_STUB(glVertexAttrib3fNV, 774)

-	GL_STUB(glVertexAttrib3fvNV, 775)

-	GL_STUB(glVertexAttrib3sNV, 776)

-	GL_STUB(glVertexAttrib3svNV, 777)

-	GL_STUB(glVertexAttrib4dNV, 778)

-	GL_STUB(glVertexAttrib4dvNV, 779)

-	GL_STUB(glVertexAttrib4fNV, 780)

-	GL_STUB(glVertexAttrib4fvNV, 781)

-	GL_STUB(glVertexAttrib4sNV, 782)

-	GL_STUB(glVertexAttrib4svNV, 783)

-	GL_STUB(glVertexAttrib4ubNV, 784)

-	GL_STUB(glVertexAttrib4ubvNV, 785)

-	GL_STUB(glVertexAttribPointerNV, 786)

-	GL_STUB(glVertexAttribs1dvNV, 787)

-	GL_STUB(glVertexAttribs1fvNV, 788)

-	GL_STUB(glVertexAttribs1svNV, 789)

-	GL_STUB(glVertexAttribs2dvNV, 790)

-	GL_STUB(glVertexAttribs2fvNV, 791)

-	GL_STUB(glVertexAttribs2svNV, 792)

-	GL_STUB(glVertexAttribs3dvNV, 793)

-	GL_STUB(glVertexAttribs3fvNV, 794)

-	GL_STUB(glVertexAttribs3svNV, 795)

-	GL_STUB(glVertexAttribs4dvNV, 796)

-	GL_STUB(glVertexAttribs4fvNV, 797)

-	GL_STUB(glVertexAttribs4svNV, 798)

-	GL_STUB(glVertexAttribs4ubvNV, 799)

-	GL_STUB(glGetTexBumpParameterfvATI, 800)

-	GL_STUB(glGetTexBumpParameterivATI, 801)

-	GL_STUB(glTexBumpParameterfvATI, 802)

-	GL_STUB(glTexBumpParameterivATI, 803)

-	GL_STUB(glAlphaFragmentOp1ATI, 804)

-	GL_STUB(glAlphaFragmentOp2ATI, 805)

-	GL_STUB(glAlphaFragmentOp3ATI, 806)

-	GL_STUB(glBeginFragmentShaderATI, 807)

-	GL_STUB(glBindFragmentShaderATI, 808)

-	GL_STUB(glColorFragmentOp1ATI, 809)

-	GL_STUB(glColorFragmentOp2ATI, 810)

-	GL_STUB(glColorFragmentOp3ATI, 811)

-	GL_STUB(glDeleteFragmentShaderATI, 812)

-	GL_STUB(glEndFragmentShaderATI, 813)

-	GL_STUB(glGenFragmentShadersATI, 814)

-	GL_STUB(glPassTexCoordATI, 815)

-	GL_STUB(glSampleMapATI, 816)

-	GL_STUB(glSetFragmentShaderConstantATI, 817)

-	GL_STUB(glPointParameteriNV, 818)

-	GL_STUB(glPointParameterivNV, 819)

-	GL_STUB(gl_dispatch_stub_820, 820)

-	HIDDEN(gl_dispatch_stub_820)

+	GL_STUB(gl_dispatch_stub_740, 740)

+	HIDDEN(gl_dispatch_stub_740)

+	GL_STUB(glAreProgramsResidentNV, 741)

+	GL_STUB(glBindProgramNV, 742)

+	GL_STUB(glDeleteProgramsNV, 743)

+	GL_STUB(glExecuteProgramNV, 744)

+	GL_STUB(glGenProgramsNV, 745)

+	GL_STUB(glGetProgramParameterdvNV, 746)

+	GL_STUB(glGetProgramParameterfvNV, 747)

+	GL_STUB(glGetProgramStringNV, 748)

+	GL_STUB(glGetProgramivNV, 749)

+	GL_STUB(glGetTrackMatrixivNV, 750)

+	GL_STUB(glGetVertexAttribPointervNV, 751)

+	GL_STUB(glGetVertexAttribdvNV, 752)

+	GL_STUB(glGetVertexAttribfvNV, 753)

+	GL_STUB(glGetVertexAttribivNV, 754)

+	GL_STUB(glIsProgramNV, 755)

+	GL_STUB(glLoadProgramNV, 756)

+	GL_STUB(glProgramParameters4dvNV, 757)

+	GL_STUB(glProgramParameters4fvNV, 758)

+	GL_STUB(glRequestResidentProgramsNV, 759)

+	GL_STUB(glTrackMatrixNV, 760)

+	GL_STUB(glVertexAttrib1dNV, 761)

+	GL_STUB(glVertexAttrib1dvNV, 762)

+	GL_STUB(glVertexAttrib1fNV, 763)

+	GL_STUB(glVertexAttrib1fvNV, 764)

+	GL_STUB(glVertexAttrib1sNV, 765)

+	GL_STUB(glVertexAttrib1svNV, 766)

+	GL_STUB(glVertexAttrib2dNV, 767)

+	GL_STUB(glVertexAttrib2dvNV, 768)

+	GL_STUB(glVertexAttrib2fNV, 769)

+	GL_STUB(glVertexAttrib2fvNV, 770)

+	GL_STUB(glVertexAttrib2sNV, 771)

+	GL_STUB(glVertexAttrib2svNV, 772)

+	GL_STUB(glVertexAttrib3dNV, 773)

+	GL_STUB(glVertexAttrib3dvNV, 774)

+	GL_STUB(glVertexAttrib3fNV, 775)

+	GL_STUB(glVertexAttrib3fvNV, 776)

+	GL_STUB(glVertexAttrib3sNV, 777)

+	GL_STUB(glVertexAttrib3svNV, 778)

+	GL_STUB(glVertexAttrib4dNV, 779)

+	GL_STUB(glVertexAttrib4dvNV, 780)

+	GL_STUB(glVertexAttrib4fNV, 781)

+	GL_STUB(glVertexAttrib4fvNV, 782)

+	GL_STUB(glVertexAttrib4sNV, 783)

+	GL_STUB(glVertexAttrib4svNV, 784)

+	GL_STUB(glVertexAttrib4ubNV, 785)

+	GL_STUB(glVertexAttrib4ubvNV, 786)

+	GL_STUB(glVertexAttribPointerNV, 787)

+	GL_STUB(glVertexAttribs1dvNV, 788)

+	GL_STUB(glVertexAttribs1fvNV, 789)

+	GL_STUB(glVertexAttribs1svNV, 790)

+	GL_STUB(glVertexAttribs2dvNV, 791)

+	GL_STUB(glVertexAttribs2fvNV, 792)

+	GL_STUB(glVertexAttribs2svNV, 793)

+	GL_STUB(glVertexAttribs3dvNV, 794)

+	GL_STUB(glVertexAttribs3fvNV, 795)

+	GL_STUB(glVertexAttribs3svNV, 796)

+	GL_STUB(glVertexAttribs4dvNV, 797)

+	GL_STUB(glVertexAttribs4fvNV, 798)

+	GL_STUB(glVertexAttribs4svNV, 799)

+	GL_STUB(glVertexAttribs4ubvNV, 800)

+	GL_STUB(glGetTexBumpParameterfvATI, 801)

+	GL_STUB(glGetTexBumpParameterivATI, 802)

+	GL_STUB(glTexBumpParameterfvATI, 803)

+	GL_STUB(glTexBumpParameterivATI, 804)

+	GL_STUB(glAlphaFragmentOp1ATI, 805)

+	GL_STUB(glAlphaFragmentOp2ATI, 806)

+	GL_STUB(glAlphaFragmentOp3ATI, 807)

+	GL_STUB(glBeginFragmentShaderATI, 808)

+	GL_STUB(glBindFragmentShaderATI, 809)

+	GL_STUB(glColorFragmentOp1ATI, 810)

+	GL_STUB(glColorFragmentOp2ATI, 811)

+	GL_STUB(glColorFragmentOp3ATI, 812)

+	GL_STUB(glDeleteFragmentShaderATI, 813)

+	GL_STUB(glEndFragmentShaderATI, 814)

+	GL_STUB(glGenFragmentShadersATI, 815)

+	GL_STUB(glPassTexCoordATI, 816)

+	GL_STUB(glSampleMapATI, 817)

+	GL_STUB(glSetFragmentShaderConstantATI, 818)

+	GL_STUB(glPointParameteriNV, 819)

+	GL_STUB(glPointParameterivNV, 820)

 	GL_STUB(gl_dispatch_stub_821, 821)

 	HIDDEN(gl_dispatch_stub_821)

 	GL_STUB(gl_dispatch_stub_822, 822)

@@ -1043,111 +1042,111 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_823)

 	GL_STUB(gl_dispatch_stub_824, 824)

 	HIDDEN(gl_dispatch_stub_824)

-	GL_STUB(glGetProgramNamedParameterdvNV, 825)

-	GL_STUB(glGetProgramNamedParameterfvNV, 826)

-	GL_STUB(glProgramNamedParameter4dNV, 827)

-	GL_STUB(glProgramNamedParameter4dvNV, 828)

-	GL_STUB(glProgramNamedParameter4fNV, 829)

-	GL_STUB(glProgramNamedParameter4fvNV, 830)

-	GL_STUB(glPrimitiveRestartIndexNV, 831)

-	GL_STUB(glPrimitiveRestartNV, 832)

-	GL_STUB(gl_dispatch_stub_833, 833)

-	HIDDEN(gl_dispatch_stub_833)

+	GL_STUB(gl_dispatch_stub_825, 825)

+	HIDDEN(gl_dispatch_stub_825)

+	GL_STUB(glGetProgramNamedParameterdvNV, 826)

+	GL_STUB(glGetProgramNamedParameterfvNV, 827)

+	GL_STUB(glProgramNamedParameter4dNV, 828)

+	GL_STUB(glProgramNamedParameter4dvNV, 829)

+	GL_STUB(glProgramNamedParameter4fNV, 830)

+	GL_STUB(glProgramNamedParameter4fvNV, 831)

+	GL_STUB(glPrimitiveRestartIndexNV, 832)

+	GL_STUB(glPrimitiveRestartNV, 833)

 	GL_STUB(gl_dispatch_stub_834, 834)

 	HIDDEN(gl_dispatch_stub_834)

-	GL_STUB(glBindFramebufferEXT, 835)

-	GL_STUB(glBindRenderbufferEXT, 836)

-	GL_STUB(glCheckFramebufferStatusEXT, 837)

-	GL_STUB(glDeleteFramebuffersEXT, 838)

-	GL_STUB(glDeleteRenderbuffersEXT, 839)

-	GL_STUB(glFramebufferRenderbufferEXT, 840)

-	GL_STUB(glFramebufferTexture1DEXT, 841)

-	GL_STUB(glFramebufferTexture2DEXT, 842)

-	GL_STUB(glFramebufferTexture3DEXT, 843)

-	GL_STUB(glGenFramebuffersEXT, 844)

-	GL_STUB(glGenRenderbuffersEXT, 845)

-	GL_STUB(glGenerateMipmapEXT, 846)

-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 847)

-	GL_STUB(glGetRenderbufferParameterivEXT, 848)

-	GL_STUB(glIsFramebufferEXT, 849)

-	GL_STUB(glIsRenderbufferEXT, 850)

-	GL_STUB(glRenderbufferStorageEXT, 851)

-	GL_STUB(gl_dispatch_stub_852, 852)

-	HIDDEN(gl_dispatch_stub_852)

+	GL_STUB(gl_dispatch_stub_835, 835)

+	HIDDEN(gl_dispatch_stub_835)

+	GL_STUB(glBindFramebufferEXT, 836)

+	GL_STUB(glBindRenderbufferEXT, 837)

+	GL_STUB(glCheckFramebufferStatusEXT, 838)

+	GL_STUB(glDeleteFramebuffersEXT, 839)

+	GL_STUB(glDeleteRenderbuffersEXT, 840)

+	GL_STUB(glFramebufferRenderbufferEXT, 841)

+	GL_STUB(glFramebufferTexture1DEXT, 842)

+	GL_STUB(glFramebufferTexture2DEXT, 843)

+	GL_STUB(glFramebufferTexture3DEXT, 844)

+	GL_STUB(glGenFramebuffersEXT, 845)

+	GL_STUB(glGenRenderbuffersEXT, 846)

+	GL_STUB(glGenerateMipmapEXT, 847)

+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 848)

+	GL_STUB(glGetRenderbufferParameterivEXT, 849)

+	GL_STUB(glIsFramebufferEXT, 850)

+	GL_STUB(glIsRenderbufferEXT, 851)

+	GL_STUB(glRenderbufferStorageEXT, 852)

 	GL_STUB(gl_dispatch_stub_853, 853)

 	HIDDEN(gl_dispatch_stub_853)

 	GL_STUB(gl_dispatch_stub_854, 854)

 	HIDDEN(gl_dispatch_stub_854)

-	GL_STUB(glBindFragDataLocationEXT, 855)

-	GL_STUB(glGetFragDataLocationEXT, 856)

-	GL_STUB(glGetUniformuivEXT, 857)

-	GL_STUB(glGetVertexAttribIivEXT, 858)

-	GL_STUB(glGetVertexAttribIuivEXT, 859)

-	GL_STUB(glUniform1uiEXT, 860)

-	GL_STUB(glUniform1uivEXT, 861)

-	GL_STUB(glUniform2uiEXT, 862)

-	GL_STUB(glUniform2uivEXT, 863)

-	GL_STUB(glUniform3uiEXT, 864)

-	GL_STUB(glUniform3uivEXT, 865)

-	GL_STUB(glUniform4uiEXT, 866)

-	GL_STUB(glUniform4uivEXT, 867)

-	GL_STUB(glVertexAttribI1iEXT, 868)

-	GL_STUB(glVertexAttribI1ivEXT, 869)

-	GL_STUB(glVertexAttribI1uiEXT, 870)

-	GL_STUB(glVertexAttribI1uivEXT, 871)

-	GL_STUB(glVertexAttribI2iEXT, 872)

-	GL_STUB(glVertexAttribI2ivEXT, 873)

-	GL_STUB(glVertexAttribI2uiEXT, 874)

-	GL_STUB(glVertexAttribI2uivEXT, 875)

-	GL_STUB(glVertexAttribI3iEXT, 876)

-	GL_STUB(glVertexAttribI3ivEXT, 877)

-	GL_STUB(glVertexAttribI3uiEXT, 878)

-	GL_STUB(glVertexAttribI3uivEXT, 879)

-	GL_STUB(glVertexAttribI4bvEXT, 880)

-	GL_STUB(glVertexAttribI4iEXT, 881)

-	GL_STUB(glVertexAttribI4ivEXT, 882)

-	GL_STUB(glVertexAttribI4svEXT, 883)

-	GL_STUB(glVertexAttribI4ubvEXT, 884)

-	GL_STUB(glVertexAttribI4uiEXT, 885)

-	GL_STUB(glVertexAttribI4uivEXT, 886)

-	GL_STUB(glVertexAttribI4usvEXT, 887)

-	GL_STUB(glVertexAttribIPointerEXT, 888)

-	GL_STUB(glFramebufferTextureLayerEXT, 889)

-	GL_STUB(glColorMaskIndexedEXT, 890)

-	GL_STUB(glDisableIndexedEXT, 891)

-	GL_STUB(glEnableIndexedEXT, 892)

-	GL_STUB(glGetBooleanIndexedvEXT, 893)

-	GL_STUB(glGetIntegerIndexedvEXT, 894)

-	GL_STUB(glIsEnabledIndexedEXT, 895)

-	GL_STUB(glClearColorIiEXT, 896)

-	GL_STUB(glClearColorIuiEXT, 897)

-	GL_STUB(glGetTexParameterIivEXT, 898)

-	GL_STUB(glGetTexParameterIuivEXT, 899)

-	GL_STUB(glTexParameterIivEXT, 900)

-	GL_STUB(glTexParameterIuivEXT, 901)

-	GL_STUB(glBeginConditionalRenderNV, 902)

-	GL_STUB(glEndConditionalRenderNV, 903)

-	GL_STUB(glBeginTransformFeedbackEXT, 904)

-	GL_STUB(glBindBufferBaseEXT, 905)

-	GL_STUB(glBindBufferOffsetEXT, 906)

-	GL_STUB(glBindBufferRangeEXT, 907)

-	GL_STUB(glEndTransformFeedbackEXT, 908)

-	GL_STUB(glGetTransformFeedbackVaryingEXT, 909)

-	GL_STUB(glTransformFeedbackVaryingsEXT, 910)

-	GL_STUB(glProvokingVertexEXT, 911)

-	GL_STUB(gl_dispatch_stub_912, 912)

-	HIDDEN(gl_dispatch_stub_912)

+	GL_STUB(gl_dispatch_stub_855, 855)

+	HIDDEN(gl_dispatch_stub_855)

+	GL_STUB(glBindFragDataLocationEXT, 856)

+	GL_STUB(glGetFragDataLocationEXT, 857)

+	GL_STUB(glGetUniformuivEXT, 858)

+	GL_STUB(glGetVertexAttribIivEXT, 859)

+	GL_STUB(glGetVertexAttribIuivEXT, 860)

+	GL_STUB(glUniform1uiEXT, 861)

+	GL_STUB(glUniform1uivEXT, 862)

+	GL_STUB(glUniform2uiEXT, 863)

+	GL_STUB(glUniform2uivEXT, 864)

+	GL_STUB(glUniform3uiEXT, 865)

+	GL_STUB(glUniform3uivEXT, 866)

+	GL_STUB(glUniform4uiEXT, 867)

+	GL_STUB(glUniform4uivEXT, 868)

+	GL_STUB(glVertexAttribI1iEXT, 869)

+	GL_STUB(glVertexAttribI1ivEXT, 870)

+	GL_STUB(glVertexAttribI1uiEXT, 871)

+	GL_STUB(glVertexAttribI1uivEXT, 872)

+	GL_STUB(glVertexAttribI2iEXT, 873)

+	GL_STUB(glVertexAttribI2ivEXT, 874)

+	GL_STUB(glVertexAttribI2uiEXT, 875)

+	GL_STUB(glVertexAttribI2uivEXT, 876)

+	GL_STUB(glVertexAttribI3iEXT, 877)

+	GL_STUB(glVertexAttribI3ivEXT, 878)

+	GL_STUB(glVertexAttribI3uiEXT, 879)

+	GL_STUB(glVertexAttribI3uivEXT, 880)

+	GL_STUB(glVertexAttribI4bvEXT, 881)

+	GL_STUB(glVertexAttribI4iEXT, 882)

+	GL_STUB(glVertexAttribI4ivEXT, 883)

+	GL_STUB(glVertexAttribI4svEXT, 884)

+	GL_STUB(glVertexAttribI4ubvEXT, 885)

+	GL_STUB(glVertexAttribI4uiEXT, 886)

+	GL_STUB(glVertexAttribI4uivEXT, 887)

+	GL_STUB(glVertexAttribI4usvEXT, 888)

+	GL_STUB(glVertexAttribIPointerEXT, 889)

+	GL_STUB(glFramebufferTextureLayerEXT, 890)

+	GL_STUB(glColorMaskIndexedEXT, 891)

+	GL_STUB(glDisableIndexedEXT, 892)

+	GL_STUB(glEnableIndexedEXT, 893)

+	GL_STUB(glGetBooleanIndexedvEXT, 894)

+	GL_STUB(glGetIntegerIndexedvEXT, 895)

+	GL_STUB(glIsEnabledIndexedEXT, 896)

+	GL_STUB(glClearColorIiEXT, 897)

+	GL_STUB(glClearColorIuiEXT, 898)

+	GL_STUB(glGetTexParameterIivEXT, 899)

+	GL_STUB(glGetTexParameterIuivEXT, 900)

+	GL_STUB(glTexParameterIivEXT, 901)

+	GL_STUB(glTexParameterIuivEXT, 902)

+	GL_STUB(glBeginConditionalRenderNV, 903)

+	GL_STUB(glEndConditionalRenderNV, 904)

+	GL_STUB(glBeginTransformFeedbackEXT, 905)

+	GL_STUB(glBindBufferBaseEXT, 906)

+	GL_STUB(glBindBufferOffsetEXT, 907)

+	GL_STUB(glBindBufferRangeEXT, 908)

+	GL_STUB(glEndTransformFeedbackEXT, 909)

+	GL_STUB(glGetTransformFeedbackVaryingEXT, 910)

+	GL_STUB(glTransformFeedbackVaryingsEXT, 911)

+	GL_STUB(glProvokingVertexEXT, 912)

 	GL_STUB(gl_dispatch_stub_913, 913)

 	HIDDEN(gl_dispatch_stub_913)

-	GL_STUB(glGetObjectParameterivAPPLE, 914)

-	GL_STUB(glObjectPurgeableAPPLE, 915)

-	GL_STUB(glObjectUnpurgeableAPPLE, 916)

-	GL_STUB(glActiveProgramEXT, 917)

-	GL_STUB(glCreateShaderProgramEXT, 918)

-	GL_STUB(glUseShaderProgramEXT, 919)

-	GL_STUB(glTextureBarrierNV, 920)

-	GL_STUB(gl_dispatch_stub_921, 921)

-	HIDDEN(gl_dispatch_stub_921)

+	GL_STUB(gl_dispatch_stub_914, 914)

+	HIDDEN(gl_dispatch_stub_914)

+	GL_STUB(glGetObjectParameterivAPPLE, 915)

+	GL_STUB(glObjectPurgeableAPPLE, 916)

+	GL_STUB(glObjectUnpurgeableAPPLE, 917)

+	GL_STUB(glActiveProgramEXT, 918)

+	GL_STUB(glCreateShaderProgramEXT, 919)

+	GL_STUB(glUseShaderProgramEXT, 920)

+	GL_STUB(glTextureBarrierNV, 921)

 	GL_STUB(gl_dispatch_stub_922, 922)

 	HIDDEN(gl_dispatch_stub_922)

 	GL_STUB(gl_dispatch_stub_923, 923)

@@ -1156,8 +1155,10 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_924)

 	GL_STUB(gl_dispatch_stub_925, 925)

 	HIDDEN(gl_dispatch_stub_925)

-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 926)

-	GL_STUB(glEGLImageTargetTexture2DOES, 927)

+	GL_STUB(gl_dispatch_stub_926, 926)

+	HIDDEN(gl_dispatch_stub_926)

+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 927)

+	GL_STUB(glEGLImageTargetTexture2DOES, 928)

 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)

 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)

 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)