Synchronised files

3 files changed, 170 insertions, 179 deletions

diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c
index a4dd69d9f..88392b9f6 100644
--- a/xorg-server/glx/glapi_gentable.c
+++ b/xorg-server/glx/glapi_gentable.c
@@ -5533,13 +5533,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }

 

 

-    if(!disp->DrawBuffersARB) {

-        void ** procp = (void **) &disp->DrawBuffersARB;

-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersNV", symbol_prefix);

-        *procp = dlsym(handle, symboln);

-    }

-

-

     if(!disp->ClampColorARB) {

         void ** procp = (void **) &disp->ClampColorARB;

         snprintf(symboln, sizeof(symboln), "%sClampColorARB", symbol_prefix);

diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index 5dce7a1da..4a952db93 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -1213,7 +1213,6 @@ static const char gl_string_table[] =
     "glGetAttribLocation\0"

     "glDrawBuffers\0"

     "glDrawBuffersATI\0"

-    "glDrawBuffersNV\0"

     "glDrawArraysInstancedEXT\0"

     "glDrawArraysInstanced\0"

     "glDrawElementsInstancedEXT\0"

@@ -2616,171 +2615,170 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(21233, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 569),

     NAME_FUNC_OFFSET(21253, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),

     NAME_FUNC_OFFSET(21267, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),

-    NAME_FUNC_OFFSET(21284, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),

-    NAME_FUNC_OFFSET(21300, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),

-    NAME_FUNC_OFFSET(21325, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),

-    NAME_FUNC_OFFSET(21347, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),

-    NAME_FUNC_OFFSET(21374, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),

-    NAME_FUNC_OFFSET(21398, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),

-    NAME_FUNC_OFFSET(21434, glTexBufferARB, glTexBufferARB, NULL, 581),

-    NAME_FUNC_OFFSET(21446, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 603),

-    NAME_FUNC_OFFSET(21480, glBlendEquationiARB, glBlendEquationiARB, NULL, 604),

-    NAME_FUNC_OFFSET(21506, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 605),

-    NAME_FUNC_OFFSET(21536, glBlendFunciARB, glBlendFunciARB, NULL, 606),

-    NAME_FUNC_OFFSET(21558, gl_dispatch_stub_708, gl_dispatch_stub_708, NULL, 708),

-    NAME_FUNC_OFFSET(21574, gl_dispatch_stub_709, gl_dispatch_stub_709, NULL, 709),

-    NAME_FUNC_OFFSET(21593, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

-    NAME_FUNC_OFFSET(21611, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

-    NAME_FUNC_OFFSET(21632, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

-    NAME_FUNC_OFFSET(21654, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

-    NAME_FUNC_OFFSET(21673, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

-    NAME_FUNC_OFFSET(21695, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

-    NAME_FUNC_OFFSET(21718, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 720),

-    NAME_FUNC_OFFSET(21737, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 721),

-    NAME_FUNC_OFFSET(21757, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 722),

-    NAME_FUNC_OFFSET(21776, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 723),

-    NAME_FUNC_OFFSET(21796, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 724),

-    NAME_FUNC_OFFSET(21815, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 725),

-    NAME_FUNC_OFFSET(21835, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 726),

-    NAME_FUNC_OFFSET(21854, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 727),

-    NAME_FUNC_OFFSET(21874, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 728),

-    NAME_FUNC_OFFSET(21893, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 729),

-    NAME_FUNC_OFFSET(21913, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 730),

-    NAME_FUNC_OFFSET(21933, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 731),

-    NAME_FUNC_OFFSET(21954, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 732),

-    NAME_FUNC_OFFSET(21974, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 733),

-    NAME_FUNC_OFFSET(21995, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 734),

-    NAME_FUNC_OFFSET(22015, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 735),

-    NAME_FUNC_OFFSET(22036, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 736),

-    NAME_FUNC_OFFSET(22060, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 737),

-    NAME_FUNC_OFFSET(22078, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 738),

-    NAME_FUNC_OFFSET(22098, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 739),

-    NAME_FUNC_OFFSET(22116, glFogCoorddEXT, glFogCoorddEXT, NULL, 740),

-    NAME_FUNC_OFFSET(22128, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 741),

-    NAME_FUNC_OFFSET(22141, glFogCoordfEXT, glFogCoordfEXT, NULL, 742),

-    NAME_FUNC_OFFSET(22153, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 743),

-    NAME_FUNC_OFFSET(22166, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 744),

-    NAME_FUNC_OFFSET(22186, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 744),

-    NAME_FUNC_OFFSET(22210, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 746),

-    NAME_FUNC_OFFSET(22224, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 746),

-    NAME_FUNC_OFFSET(22241, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 747),

-    NAME_FUNC_OFFSET(22256, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 747),

-    NAME_FUNC_OFFSET(22274, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 748),

-    NAME_FUNC_OFFSET(22288, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 748),

-    NAME_FUNC_OFFSET(22305, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 749),

-    NAME_FUNC_OFFSET(22320, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 749),

-    NAME_FUNC_OFFSET(22338, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 750),

-    NAME_FUNC_OFFSET(22352, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 750),

-    NAME_FUNC_OFFSET(22369, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 751),

-    NAME_FUNC_OFFSET(22384, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 751),

-    NAME_FUNC_OFFSET(22402, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 752),

-    NAME_FUNC_OFFSET(22416, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 752),

-    NAME_FUNC_OFFSET(22433, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 753),

-    NAME_FUNC_OFFSET(22448, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 753),

-    NAME_FUNC_OFFSET(22466, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 754),

-    NAME_FUNC_OFFSET(22480, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 754),

-    NAME_FUNC_OFFSET(22497, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 755),

-    NAME_FUNC_OFFSET(22512, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 755),

-    NAME_FUNC_OFFSET(22530, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 756),

-    NAME_FUNC_OFFSET(22544, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 756),

-    NAME_FUNC_OFFSET(22561, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 757),

-    NAME_FUNC_OFFSET(22576, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 757),

-    NAME_FUNC_OFFSET(22594, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 758),

-    NAME_FUNC_OFFSET(22608, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 758),

-    NAME_FUNC_OFFSET(22625, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 759),

-    NAME_FUNC_OFFSET(22640, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 759),

-    NAME_FUNC_OFFSET(22658, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 760),

-    NAME_FUNC_OFFSET(22672, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 760),

-    NAME_FUNC_OFFSET(22689, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 761),

-    NAME_FUNC_OFFSET(22704, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 761),

-    NAME_FUNC_OFFSET(22722, glBindProgramNV, glBindProgramNV, NULL, 773),

-    NAME_FUNC_OFFSET(22739, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 774),

-    NAME_FUNC_OFFSET(22759, glGenProgramsNV, glGenProgramsNV, NULL, 776),

-    NAME_FUNC_OFFSET(22776, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 782),

-    NAME_FUNC_OFFSET(22802, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 782),

-    NAME_FUNC_OFFSET(22831, glIsProgramNV, glIsProgramNV, NULL, 786),

-    NAME_FUNC_OFFSET(22846, glPointParameteriNV, glPointParameteriNV, NULL, 850),

-    NAME_FUNC_OFFSET(22864, glPointParameterivNV, glPointParameterivNV, NULL, 851),

-    NAME_FUNC_OFFSET(22883, gl_dispatch_stub_854, gl_dispatch_stub_854, NULL, 854),

-    NAME_FUNC_OFFSET(22904, gl_dispatch_stub_856, gl_dispatch_stub_856, NULL, 856),

-    NAME_FUNC_OFFSET(22920, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 863),

-    NAME_FUNC_OFFSET(22944, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),

-    NAME_FUNC_OFFSET(22968, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),

-    NAME_FUNC_OFFSET(22995, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 867),

-    NAME_FUNC_OFFSET(23013, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 868),

-    NAME_FUNC_OFFSET(23032, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 869),

-    NAME_FUNC_OFFSET(23057, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 870),

-    NAME_FUNC_OFFSET(23078, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 871),

-    NAME_FUNC_OFFSET(23100, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 872),

-    NAME_FUNC_OFFSET(23126, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 873),

-    NAME_FUNC_OFFSET(23149, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 874),

-    NAME_FUNC_OFFSET(23172, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 875),

-    NAME_FUNC_OFFSET(23195, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 876),

-    NAME_FUNC_OFFSET(23213, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 877),

-    NAME_FUNC_OFFSET(23232, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 878),

-    NAME_FUNC_OFFSET(23249, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 879),

-    NAME_FUNC_OFFSET(23287, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 880),

-    NAME_FUNC_OFFSET(23316, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 881),

-    NAME_FUNC_OFFSET(23332, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 882),

-    NAME_FUNC_OFFSET(23349, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 883),

-    NAME_FUNC_OFFSET(23371, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),

-    NAME_FUNC_OFFSET(23389, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 887),

-    NAME_FUNC_OFFSET(23412, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 888),

-    NAME_FUNC_OFFSET(23434, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 889),

-    NAME_FUNC_OFFSET(23450, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 890),

-    NAME_FUNC_OFFSET(23471, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 891),

-    NAME_FUNC_OFFSET(23493, glUniform1uiEXT, glUniform1uiEXT, NULL, 892),

-    NAME_FUNC_OFFSET(23506, glUniform1uivEXT, glUniform1uivEXT, NULL, 893),

-    NAME_FUNC_OFFSET(23520, glUniform2uiEXT, glUniform2uiEXT, NULL, 894),

-    NAME_FUNC_OFFSET(23533, glUniform2uivEXT, glUniform2uivEXT, NULL, 895),

-    NAME_FUNC_OFFSET(23547, glUniform3uiEXT, glUniform3uiEXT, NULL, 896),

-    NAME_FUNC_OFFSET(23560, glUniform3uivEXT, glUniform3uivEXT, NULL, 897),

-    NAME_FUNC_OFFSET(23574, glUniform4uiEXT, glUniform4uiEXT, NULL, 898),

-    NAME_FUNC_OFFSET(23587, glUniform4uivEXT, glUniform4uivEXT, NULL, 899),

-    NAME_FUNC_OFFSET(23601, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 900),

-    NAME_FUNC_OFFSET(23619, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 901),

-    NAME_FUNC_OFFSET(23638, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 902),

-    NAME_FUNC_OFFSET(23657, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 903),

-    NAME_FUNC_OFFSET(23677, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 904),

-    NAME_FUNC_OFFSET(23695, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 905),

-    NAME_FUNC_OFFSET(23714, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 906),

-    NAME_FUNC_OFFSET(23733, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 907),

-    NAME_FUNC_OFFSET(23753, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 908),

-    NAME_FUNC_OFFSET(23771, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 909),

-    NAME_FUNC_OFFSET(23790, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 910),

-    NAME_FUNC_OFFSET(23809, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 911),

-    NAME_FUNC_OFFSET(23829, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 912),

-    NAME_FUNC_OFFSET(23848, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 913),

-    NAME_FUNC_OFFSET(23866, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 914),

-    NAME_FUNC_OFFSET(23885, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 915),

-    NAME_FUNC_OFFSET(23904, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 916),

-    NAME_FUNC_OFFSET(23924, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 917),

-    NAME_FUNC_OFFSET(23943, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 918),

-    NAME_FUNC_OFFSET(23963, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 919),

-    NAME_FUNC_OFFSET(23983, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 920),

-    NAME_FUNC_OFFSET(24006, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 921),

-    NAME_FUNC_OFFSET(24032, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 921),

-    NAME_FUNC_OFFSET(24061, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 922),

-    NAME_FUNC_OFFSET(24074, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 923),

-    NAME_FUNC_OFFSET(24085, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 924),

-    NAME_FUNC_OFFSET(24095, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 925),

-    NAME_FUNC_OFFSET(24111, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 926),

-    NAME_FUNC_OFFSET(24127, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 927),

-    NAME_FUNC_OFFSET(24140, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 930),

-    NAME_FUNC_OFFSET(24161, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 931),

-    NAME_FUNC_OFFSET(24183, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 932),

-    NAME_FUNC_OFFSET(24201, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 933),

-    NAME_FUNC_OFFSET(24220, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 934),

-    NAME_FUNC_OFFSET(24245, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 935),

-    NAME_FUNC_OFFSET(24268, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 936),

-    NAME_FUNC_OFFSET(24293, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 937),

-    NAME_FUNC_OFFSET(24310, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 939),

-    NAME_FUNC_OFFSET(24328, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 940),

-    NAME_FUNC_OFFSET(24351, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 941),

-    NAME_FUNC_OFFSET(24381, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 942),

-    NAME_FUNC_OFFSET(24409, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 943),

-    NAME_FUNC_OFFSET(24427, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),

-    NAME_FUNC_OFFSET(24448, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),

+    NAME_FUNC_OFFSET(21284, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),

+    NAME_FUNC_OFFSET(21309, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),

+    NAME_FUNC_OFFSET(21331, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),

+    NAME_FUNC_OFFSET(21358, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),

+    NAME_FUNC_OFFSET(21382, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),

+    NAME_FUNC_OFFSET(21418, glTexBufferARB, glTexBufferARB, NULL, 581),

+    NAME_FUNC_OFFSET(21430, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 603),

+    NAME_FUNC_OFFSET(21464, glBlendEquationiARB, glBlendEquationiARB, NULL, 604),

+    NAME_FUNC_OFFSET(21490, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 605),

+    NAME_FUNC_OFFSET(21520, glBlendFunciARB, glBlendFunciARB, NULL, 606),

+    NAME_FUNC_OFFSET(21542, gl_dispatch_stub_708, gl_dispatch_stub_708, NULL, 708),

+    NAME_FUNC_OFFSET(21558, gl_dispatch_stub_709, gl_dispatch_stub_709, NULL, 709),

+    NAME_FUNC_OFFSET(21577, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

+    NAME_FUNC_OFFSET(21595, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

+    NAME_FUNC_OFFSET(21616, glPointParameterfEXT, glPointParameterfEXT, NULL, 716),

+    NAME_FUNC_OFFSET(21638, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

+    NAME_FUNC_OFFSET(21657, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

+    NAME_FUNC_OFFSET(21679, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 717),

+    NAME_FUNC_OFFSET(21702, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 720),

+    NAME_FUNC_OFFSET(21721, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 721),

+    NAME_FUNC_OFFSET(21741, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 722),

+    NAME_FUNC_OFFSET(21760, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 723),

+    NAME_FUNC_OFFSET(21780, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 724),

+    NAME_FUNC_OFFSET(21799, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 725),

+    NAME_FUNC_OFFSET(21819, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 726),

+    NAME_FUNC_OFFSET(21838, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 727),

+    NAME_FUNC_OFFSET(21858, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 728),

+    NAME_FUNC_OFFSET(21877, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 729),

+    NAME_FUNC_OFFSET(21897, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 730),

+    NAME_FUNC_OFFSET(21917, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 731),

+    NAME_FUNC_OFFSET(21938, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 732),

+    NAME_FUNC_OFFSET(21958, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 733),

+    NAME_FUNC_OFFSET(21979, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 734),

+    NAME_FUNC_OFFSET(21999, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 735),

+    NAME_FUNC_OFFSET(22020, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 736),

+    NAME_FUNC_OFFSET(22044, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 737),

+    NAME_FUNC_OFFSET(22062, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 738),

+    NAME_FUNC_OFFSET(22082, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 739),

+    NAME_FUNC_OFFSET(22100, glFogCoorddEXT, glFogCoorddEXT, NULL, 740),

+    NAME_FUNC_OFFSET(22112, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 741),

+    NAME_FUNC_OFFSET(22125, glFogCoordfEXT, glFogCoordfEXT, NULL, 742),

+    NAME_FUNC_OFFSET(22137, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 743),

+    NAME_FUNC_OFFSET(22150, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 744),

+    NAME_FUNC_OFFSET(22170, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 744),

+    NAME_FUNC_OFFSET(22194, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 746),

+    NAME_FUNC_OFFSET(22208, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 746),

+    NAME_FUNC_OFFSET(22225, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 747),

+    NAME_FUNC_OFFSET(22240, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 747),

+    NAME_FUNC_OFFSET(22258, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 748),

+    NAME_FUNC_OFFSET(22272, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 748),

+    NAME_FUNC_OFFSET(22289, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 749),

+    NAME_FUNC_OFFSET(22304, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 749),

+    NAME_FUNC_OFFSET(22322, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 750),

+    NAME_FUNC_OFFSET(22336, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 750),

+    NAME_FUNC_OFFSET(22353, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 751),

+    NAME_FUNC_OFFSET(22368, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 751),

+    NAME_FUNC_OFFSET(22386, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 752),

+    NAME_FUNC_OFFSET(22400, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 752),

+    NAME_FUNC_OFFSET(22417, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 753),

+    NAME_FUNC_OFFSET(22432, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 753),

+    NAME_FUNC_OFFSET(22450, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 754),

+    NAME_FUNC_OFFSET(22464, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 754),

+    NAME_FUNC_OFFSET(22481, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 755),

+    NAME_FUNC_OFFSET(22496, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 755),

+    NAME_FUNC_OFFSET(22514, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 756),

+    NAME_FUNC_OFFSET(22528, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 756),

+    NAME_FUNC_OFFSET(22545, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 757),

+    NAME_FUNC_OFFSET(22560, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 757),

+    NAME_FUNC_OFFSET(22578, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 758),

+    NAME_FUNC_OFFSET(22592, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 758),

+    NAME_FUNC_OFFSET(22609, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 759),

+    NAME_FUNC_OFFSET(22624, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 759),

+    NAME_FUNC_OFFSET(22642, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 760),

+    NAME_FUNC_OFFSET(22656, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 760),

+    NAME_FUNC_OFFSET(22673, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 761),

+    NAME_FUNC_OFFSET(22688, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 761),

+    NAME_FUNC_OFFSET(22706, glBindProgramNV, glBindProgramNV, NULL, 773),

+    NAME_FUNC_OFFSET(22723, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 774),

+    NAME_FUNC_OFFSET(22743, glGenProgramsNV, glGenProgramsNV, NULL, 776),

+    NAME_FUNC_OFFSET(22760, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 782),

+    NAME_FUNC_OFFSET(22786, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 782),

+    NAME_FUNC_OFFSET(22815, glIsProgramNV, glIsProgramNV, NULL, 786),

+    NAME_FUNC_OFFSET(22830, glPointParameteriNV, glPointParameteriNV, NULL, 850),

+    NAME_FUNC_OFFSET(22848, glPointParameterivNV, glPointParameterivNV, NULL, 851),

+    NAME_FUNC_OFFSET(22867, gl_dispatch_stub_854, gl_dispatch_stub_854, NULL, 854),

+    NAME_FUNC_OFFSET(22888, gl_dispatch_stub_856, gl_dispatch_stub_856, NULL, 856),

+    NAME_FUNC_OFFSET(22904, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 863),

+    NAME_FUNC_OFFSET(22928, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),

+    NAME_FUNC_OFFSET(22952, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),

+    NAME_FUNC_OFFSET(22979, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 867),

+    NAME_FUNC_OFFSET(22997, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 868),

+    NAME_FUNC_OFFSET(23016, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 869),

+    NAME_FUNC_OFFSET(23041, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 870),

+    NAME_FUNC_OFFSET(23062, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 871),

+    NAME_FUNC_OFFSET(23084, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 872),

+    NAME_FUNC_OFFSET(23110, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 873),

+    NAME_FUNC_OFFSET(23133, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 874),

+    NAME_FUNC_OFFSET(23156, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 875),

+    NAME_FUNC_OFFSET(23179, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 876),

+    NAME_FUNC_OFFSET(23197, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 877),

+    NAME_FUNC_OFFSET(23216, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 878),

+    NAME_FUNC_OFFSET(23233, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 879),

+    NAME_FUNC_OFFSET(23271, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 880),

+    NAME_FUNC_OFFSET(23300, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 881),

+    NAME_FUNC_OFFSET(23316, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 882),

+    NAME_FUNC_OFFSET(23333, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 883),

+    NAME_FUNC_OFFSET(23355, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),

+    NAME_FUNC_OFFSET(23373, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 887),

+    NAME_FUNC_OFFSET(23396, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 888),

+    NAME_FUNC_OFFSET(23418, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 889),

+    NAME_FUNC_OFFSET(23434, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 890),

+    NAME_FUNC_OFFSET(23455, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 891),

+    NAME_FUNC_OFFSET(23477, glUniform1uiEXT, glUniform1uiEXT, NULL, 892),

+    NAME_FUNC_OFFSET(23490, glUniform1uivEXT, glUniform1uivEXT, NULL, 893),

+    NAME_FUNC_OFFSET(23504, glUniform2uiEXT, glUniform2uiEXT, NULL, 894),

+    NAME_FUNC_OFFSET(23517, glUniform2uivEXT, glUniform2uivEXT, NULL, 895),

+    NAME_FUNC_OFFSET(23531, glUniform3uiEXT, glUniform3uiEXT, NULL, 896),

+    NAME_FUNC_OFFSET(23544, glUniform3uivEXT, glUniform3uivEXT, NULL, 897),

+    NAME_FUNC_OFFSET(23558, glUniform4uiEXT, glUniform4uiEXT, NULL, 898),

+    NAME_FUNC_OFFSET(23571, glUniform4uivEXT, glUniform4uivEXT, NULL, 899),

+    NAME_FUNC_OFFSET(23585, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 900),

+    NAME_FUNC_OFFSET(23603, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 901),

+    NAME_FUNC_OFFSET(23622, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 902),

+    NAME_FUNC_OFFSET(23641, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 903),

+    NAME_FUNC_OFFSET(23661, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 904),

+    NAME_FUNC_OFFSET(23679, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 905),

+    NAME_FUNC_OFFSET(23698, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 906),

+    NAME_FUNC_OFFSET(23717, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 907),

+    NAME_FUNC_OFFSET(23737, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 908),

+    NAME_FUNC_OFFSET(23755, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 909),

+    NAME_FUNC_OFFSET(23774, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 910),

+    NAME_FUNC_OFFSET(23793, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 911),

+    NAME_FUNC_OFFSET(23813, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 912),

+    NAME_FUNC_OFFSET(23832, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 913),

+    NAME_FUNC_OFFSET(23850, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 914),

+    NAME_FUNC_OFFSET(23869, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 915),

+    NAME_FUNC_OFFSET(23888, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 916),

+    NAME_FUNC_OFFSET(23908, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 917),

+    NAME_FUNC_OFFSET(23927, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 918),

+    NAME_FUNC_OFFSET(23947, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 919),

+    NAME_FUNC_OFFSET(23967, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 920),

+    NAME_FUNC_OFFSET(23990, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 921),

+    NAME_FUNC_OFFSET(24016, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 921),

+    NAME_FUNC_OFFSET(24045, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 922),

+    NAME_FUNC_OFFSET(24058, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 923),

+    NAME_FUNC_OFFSET(24069, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 924),

+    NAME_FUNC_OFFSET(24079, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 925),

+    NAME_FUNC_OFFSET(24095, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 926),

+    NAME_FUNC_OFFSET(24111, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 927),

+    NAME_FUNC_OFFSET(24124, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 930),

+    NAME_FUNC_OFFSET(24145, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 931),

+    NAME_FUNC_OFFSET(24167, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 932),

+    NAME_FUNC_OFFSET(24185, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 933),

+    NAME_FUNC_OFFSET(24204, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 934),

+    NAME_FUNC_OFFSET(24229, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 935),

+    NAME_FUNC_OFFSET(24252, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 936),

+    NAME_FUNC_OFFSET(24277, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 937),

+    NAME_FUNC_OFFSET(24294, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 939),

+    NAME_FUNC_OFFSET(24312, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 940),

+    NAME_FUNC_OFFSET(24335, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 941),

+    NAME_FUNC_OFFSET(24365, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 942),

+    NAME_FUNC_OFFSET(24393, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 943),

+    NAME_FUNC_OFFSET(24411, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),

+    NAME_FUNC_OFFSET(24432, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),

     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)

 };

 

diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index 985fc0bf3..f883998e2 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -665,11 +665,11 @@ __glGetBooleanv_size( GLenum e )
         case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:

         case GL_FRAGMENT_PROGRAM_ARB:

         case GL_MAX_DRAW_BUFFERS_ARB:

-/*      case GL_MAX_DRAW_BUFFERS_NV:*/

+/*      case GL_MAX_DRAW_BUFFERS_ATI:*/

         case GL_DRAW_BUFFER0_ARB:

 /*      case GL_DRAW_BUFFER0_ATI:*/

         case GL_DRAW_BUFFER1_ARB:

-/*      case GL_DRAW_BUFFER1_NV:*/

+/*      case GL_DRAW_BUFFER1_ATI:*/

         case GL_DRAW_BUFFER2_ARB:

 /*      case GL_DRAW_BUFFER2_ATI:*/

         case GL_DRAW_BUFFER3_ARB:

@@ -687,15 +687,15 @@ __glGetBooleanv_size( GLenum e )
         case GL_DRAW_BUFFER9_ARB:

 /*      case GL_DRAW_BUFFER9_ATI:*/

         case GL_DRAW_BUFFER10_ARB:

-/*      case GL_DRAW_BUFFER10_NV:*/

+/*      case GL_DRAW_BUFFER10_ATI:*/

         case GL_DRAW_BUFFER11_ARB:

-/*      case GL_DRAW_BUFFER11_NV:*/

+/*      case GL_DRAW_BUFFER11_ATI:*/

         case GL_DRAW_BUFFER12_ARB:

-/*      case GL_DRAW_BUFFER12_NV:*/

+/*      case GL_DRAW_BUFFER12_ATI:*/

         case GL_DRAW_BUFFER13_ARB:

 /*      case GL_DRAW_BUFFER13_ATI:*/

         case GL_DRAW_BUFFER14_ARB:

-/*      case GL_DRAW_BUFFER14_NV:*/

+/*      case GL_DRAW_BUFFER14_ATI:*/

         case GL_DRAW_BUFFER15_ARB:

 /*      case GL_DRAW_BUFFER15_ATI:*/

         case GL_BLEND_EQUATION_ALPHA_EXT: