mesa: Standardize names of OpenGL functions.

This patch adjusts the aliasing pattern in the GL API description XML, and the functions that implement the GL API within Mesa, to consistently follow these naming conventions: - When several function names are aliases of each other, the primary name is the one with no extension suffix (or the name with the suffix "ARB", if no unsuffixed name is available). (By "primary name", I mean the name that all the other functions point to using the XML "alias" attribute). - The name of the mesa implementation of each function is the same as the primary name, with the prefix "_mesa_". This patch renames the following mesa functions: _check_GetTexGenxvOES => _mesa_GetTexGenxvOES _check_TexGenxOES => _mesa_TexGenxOES _check_TexGenxvOES => _mesa_TexGenxvOES _es_AlphaFuncx => _mesa_AlphaFuncx _es_ClearColorx => _mesa_ClearColorx _es_ClearDepthx => _mesa_ClearDepthx _es_ClipPlanef => _mesa_ClipPlanef _es_ClipPlanex => _mesa_ClipPlanex _es_Color4x => _mesa_Color4x _es_DepthRangex => _mesa_DepthRangex _es_DrawTexxOES => _mesa_DrawTexxOES _es_DrawTexxvOES => _mesa_DrawTexxvOES _es_Fogx => _mesa_Fogx _es_Fogxv => _mesa_Fogxv _es_Frustumf => _mesa_Frustumf _es_Frustumx => _mesa_Frustumx _es_GetClipPlanef => _mesa_GetClipPlanef _es_GetClipPlanex => _mesa_GetClipPlanex _es_GetLightxv => _mesa_GetLightxv _es_GetMaterialxv => _mesa_GetMaterialxv _es_GetTexEnvxv => _mesa_GetTexEnvxv _es_GetTexParameterxv => _mesa_GetTexParameterxv _es_LightModelx => _mesa_LightModelx _es_LightModelxv => _mesa_LightModelxv _es_Lightx => _mesa_Lightx _es_Lightxv => _mesa_Lightxv _es_LineWidthx => _mesa_LineWidthx _es_LoadMatrixx => _mesa_LoadMatrixx _es_Materialx => _mesa_Materialx _es_Materialxv => _mesa_Materialxv _es_MultMatrixx => _mesa_MultMatrixx _es_MultiTexCoord4x => _mesa_MultiTexCoord4x _es_Normal3x => _mesa_Normal3x _es_Orthof => _mesa_Orthof _es_Orthox => _mesa_Orthox _es_PointParameterx => _mesa_PointParameterx _es_PointParameterxv => _mesa_PointParameterxv _es_PointSizex => _mesa_PointSizex _es_PolygonOffsetx => _mesa_PolygonOffsetx _es_QueryMatrixxOES => _mesa_QueryMatrixxOES _es_Rotatex => _mesa_Rotatex _es_SampleCoveragex => _mesa_SampleCoveragex _es_Scalex => _mesa_Scalex _es_TexEnvx => _mesa_TexEnvx _es_TexEnvxv => _mesa_TexEnvxv _es_TexParameterx => _mesa_TexParameterx _es_TexParameterxv => _mesa_TexParameterxv _es_Translatex => _mesa_Translatex _mesa_ActiveTextureARB => _mesa_ActiveTexture _mesa_BeginQueryARB => _mesa_BeginQuery _mesa_BindAttribLocationARB => _mesa_BindAttribLocation _mesa_BindBufferARB => _mesa_BindBuffer _mesa_BindFramebufferEXT => _mesa_BindFramebuffer _mesa_BindProgram => _mesa_BindProgramARB _mesa_BindRenderbufferEXT => _mesa_BindRenderbuffer _mesa_BlendEquationSeparateEXT => _mesa_BlendEquationSeparate _mesa_BlendEquationSeparatei => _mesa_BlendEquationSeparateiARB _mesa_BlendEquationi => _mesa_BlendEquationiARB _mesa_BlendFuncSeparateEXT => _mesa_BlendFuncSeparate _mesa_BlendFuncSeparatei => _mesa_BlendFuncSeparateiARB _mesa_BlendFunci => _mesa_BlendFunciARB _mesa_BlitFramebufferEXT => _mesa_BlitFramebuffer _mesa_BufferDataARB => _mesa_BufferData _mesa_BufferSubDataARB => _mesa_BufferSubData _mesa_CheckFramebufferStatusEXT => _mesa_CheckFramebufferStatus _mesa_ClampColorARB => _mesa_ClampColor _mesa_ClientActiveTextureARB => _mesa_ClientActiveTexture _mesa_ColorMaskIndexed => _mesa_ColorMaski _mesa_CompileShaderARB => _mesa_CompileShader _mesa_CompressedTexImage1DARB => _mesa_CompressedTexImage1D _mesa_CompressedTexImage2DARB => _mesa_CompressedTexImage2D _mesa_CompressedTexImage3DARB => _mesa_CompressedTexImage3D _mesa_CompressedTexSubImage1DARB => _mesa_CompressedTexSubImage1D _mesa_CompressedTexSubImage2DARB => _mesa_CompressedTexSubImage2D _mesa_CompressedTexSubImage3DARB => _mesa_CompressedTexSubImage3D _mesa_DeleteBuffersARB => _mesa_DeleteBuffers _mesa_DeleteFramebuffersEXT => _mesa_DeleteFramebuffers _mesa_DeletePrograms => _mesa_DeleteProgramsARB _mesa_DeleteQueriesARB => _mesa_DeleteQueries _mesa_DeleteRenderbuffersEXT => _mesa_DeleteRenderbuffers _mesa_DeleteVertexArraysAPPLE => _mesa_DeleteVertexArrays _mesa_DisableIndexed => _mesa_Disablei _mesa_DisableVertexAttribArrayARB => _mesa_DisableVertexAttribArray _mesa_DrawBuffersARB => _mesa_DrawBuffers _mesa_DrawTexf => _mesa_DrawTexfOES _mesa_DrawTexfv => _mesa_DrawTexfvOES _mesa_DrawTexi => _mesa_DrawTexiOES _mesa_DrawTexiv => _mesa_DrawTexivOES _mesa_DrawTexs => _mesa_DrawTexsOES _mesa_DrawTexsv => _mesa_DrawTexsvOES _mesa_EnableIndexed => _mesa_Enablei _mesa_EnableVertexAttribArrayARB => _mesa_EnableVertexAttribArray _mesa_EndQueryARB => _mesa_EndQuery _mesa_FogCoordPointerEXT => _mesa_FogCoordPointer _mesa_FramebufferRenderbufferEXT => _mesa_FramebufferRenderbuffer _mesa_FramebufferTexture1DEXT => _mesa_FramebufferTexture1D _mesa_FramebufferTexture2DEXT => _mesa_FramebufferTexture2D _mesa_FramebufferTexture3DEXT => _mesa_FramebufferTexture3D _mesa_FramebufferTextureLayerEXT => _mesa_FramebufferTextureLayer _mesa_GenBuffersARB => _mesa_GenBuffers _mesa_GenFramebuffersEXT => _mesa_GenFramebuffers _mesa_GenPrograms => _mesa_GenProgramsARB _mesa_GenQueriesARB => _mesa_GenQueries _mesa_GenRenderbuffersEXT => _mesa_GenRenderbuffers _mesa_GenerateMipmapEXT => _mesa_GenerateMipmap _mesa_GetActiveAttribARB => _mesa_GetActiveAttrib _mesa_GetActiveUniformARB => _mesa_GetActiveUniform _mesa_GetAttribLocationARB => _mesa_GetAttribLocation _mesa_GetBooleanIndexedv => _mesa_GetBooleani_v _mesa_GetBufferParameterivARB => _mesa_GetBufferParameteriv _mesa_GetBufferPointervARB => _mesa_GetBufferPointerv _mesa_GetBufferSubDataARB => _mesa_GetBufferSubData _mesa_GetCompressedTexImageARB => _mesa_GetCompressedTexImage _mesa_GetFramebufferAttachmentParameterivEXT => _mesa_GetFramebufferAttachmentParameteriv _mesa_GetIntegerIndexedv => _mesa_GetIntegeri_v _mesa_GetQueryObjecti64vEXT => _mesa_GetQueryObjecti64v _mesa_GetQueryObjectivARB => _mesa_GetQueryObjectiv _mesa_GetQueryObjectui64vEXT => _mesa_GetQueryObjectui64v _mesa_GetQueryObjectuivARB => _mesa_GetQueryObjectuiv _mesa_GetQueryivARB => _mesa_GetQueryiv _mesa_GetRenderbufferParameterivEXT => _mesa_GetRenderbufferParameteriv _mesa_GetShaderSourceARB => _mesa_GetShaderSource _mesa_GetUniformLocationARB => _mesa_GetUniformLocation _mesa_GetUniformfvARB => _mesa_GetUniformfv _mesa_GetUniformivARB => _mesa_GetUniformiv _mesa_GetVertexAttribPointervARB => _mesa_GetVertexAttribPointerv _mesa_GetVertexAttribdvARB => _mesa_GetVertexAttribdv _mesa_GetVertexAttribfvARB => _mesa_GetVertexAttribfv _mesa_GetVertexAttribivARB => _mesa_GetVertexAttribiv _mesa_IsBufferARB => _mesa_IsBuffer _mesa_IsEnabledIndexed => _mesa_IsEnabledi _mesa_IsFramebufferEXT => _mesa_IsFramebuffer _mesa_IsQueryARB => _mesa_IsQuery _mesa_IsRenderbufferEXT => _mesa_IsRenderbuffer _mesa_IsVertexArrayAPPLE => _mesa_IsVertexArray _mesa_LinkProgramARB => _mesa_LinkProgram _mesa_LoadTransposeMatrixdARB => _mesa_LoadTransposeMatrixd _mesa_LoadTransposeMatrixfARB => _mesa_LoadTransposeMatrixf _mesa_MapBufferARB => _mesa_MapBuffer _mesa_MultTransposeMatrixdARB => _mesa_MultTransposeMatrixd _mesa_MultTransposeMatrixfARB => _mesa_MultTransposeMatrixf _mesa_MultiDrawArraysEXT => _mesa_MultiDrawArrays _mesa_PointSizePointer => _mesa_PointSizePointerOES _mesa_ProvokingVertexEXT => _mesa_ProvokingVertex _mesa_RenderbufferStorageEXT => _mesa_RenderbufferStorage _mesa_SampleCoverageARB => _mesa_SampleCoverage _mesa_SecondaryColorPointerEXT => _mesa_SecondaryColorPointer _mesa_ShaderSourceARB => _mesa_ShaderSource _mesa_Uniform1fARB => _mesa_Uniform1f _mesa_Uniform1fvARB => _mesa_Uniform1fv _mesa_Uniform1iARB => _mesa_Uniform1i _mesa_Uniform1ivARB => _mesa_Uniform1iv _mesa_Uniform2fARB => _mesa_Uniform2f _mesa_Uniform2fvARB => _mesa_Uniform2fv _mesa_Uniform2iARB => _mesa_Uniform2i _mesa_Uniform2ivARB => _mesa_Uniform2iv _mesa_Uniform3fARB => _mesa_Uniform3f _mesa_Uniform3fvARB => _mesa_Uniform3fv _mesa_Uniform3iARB => _mesa_Uniform3i _mesa_Uniform3ivARB => _mesa_Uniform3iv _mesa_Uniform4fARB => _mesa_Uniform4f _mesa_Uniform4fvARB => _mesa_Uniform4fv _mesa_Uniform4iARB => _mesa_Uniform4i _mesa_Uniform4ivARB => _mesa_Uniform4iv _mesa_UniformMatrix2fvARB => _mesa_UniformMatrix2fv _mesa_UniformMatrix3fvARB => _mesa_UniformMatrix3fv _mesa_UniformMatrix4fvARB => _mesa_UniformMatrix4fv _mesa_UnmapBufferARB => _mesa_UnmapBuffer _mesa_UseProgramObjectARB => _mesa_UseProgram _mesa_ValidateProgramARB => _mesa_ValidateProgram _mesa_VertexAttribPointerARB => _mesa_VertexAttribPointer _mesa_WindowPos2dMESA => _mesa_WindowPos2d _mesa_WindowPos2dvMESA => _mesa_WindowPos2dv _mesa_WindowPos2fMESA => _mesa_WindowPos2f _mesa_WindowPos2fvMESA => _mesa_WindowPos2fv _mesa_WindowPos2iMESA => _mesa_WindowPos2i _mesa_WindowPos2ivMESA => _mesa_WindowPos2iv _mesa_WindowPos2sMESA => _mesa_WindowPos2s _mesa_WindowPos2svMESA => _mesa_WindowPos2sv _mesa_WindowPos3dMESA => _mesa_WindowPos3d _mesa_WindowPos3dvMESA => _mesa_WindowPos3dv _mesa_WindowPos3fMESA => _mesa_WindowPos3f _mesa_WindowPos3fvMESA => _mesa_WindowPos3fv _mesa_WindowPos3iMESA => _mesa_WindowPos3i _mesa_WindowPos3ivMESA => _mesa_WindowPos3iv _mesa_WindowPos3sMESA => _mesa_WindowPos3s _mesa_WindowPos3svMESA => _mesa_WindowPos3sv loopback_Color3b_f => _mesa_Color3b loopback_Color3bv_f => _mesa_Color3bv loopback_Color3d_f => _mesa_Color3d loopback_Color3dv_f => _mesa_Color3dv loopback_Color3i_f => _mesa_Color3i loopback_Color3iv_f => _mesa_Color3iv loopback_Color3s_f => _mesa_Color3s loopback_Color3sv_f => _mesa_Color3sv loopback_Color3ub_f => _mesa_Color3ub loopback_Color3ubv_f => _mesa_Color3ubv loopback_Color3ui_f => _mesa_Color3ui loopback_Color3uiv_f => _mesa_Color3uiv loopback_Color3us_f => _mesa_Color3us loopback_Color3usv_f => _mesa_Color3usv loopback_Color4b_f => _mesa_Color4b loopback_Color4bv_f => _mesa_Color4bv loopback_Color4d_f => _mesa_Color4d loopback_Color4dv_f => _mesa_Color4dv loopback_Color4i_f => _mesa_Color4i loopback_Color4iv_f => _mesa_Color4iv loopback_Color4s_f => _mesa_Color4s loopback_Color4sv_f => _mesa_Color4sv loopback_Color4ub_f => _mesa_Color4ub loopback_Color4ubv_f => _mesa_Color4ubv loopback_Color4ui_f => _mesa_Color4ui loopback_Color4uiv_f => _mesa_Color4uiv loopback_Color4us_f => _mesa_Color4us loopback_Color4usv_f => _mesa_Color4usv loopback_EdgeFlagv => _mesa_EdgeFlagv loopback_EvalCoord1d => _mesa_EvalCoord1d loopback_EvalCoord1dv => _mesa_EvalCoord1dv loopback_EvalCoord1fv => _mesa_EvalCoord1fv loopback_EvalCoord2d => _mesa_EvalCoord2d loopback_EvalCoord2dv => _mesa_EvalCoord2dv loopback_EvalCoord2fv => _mesa_EvalCoord2fv loopback_FogCoorddEXT => _mesa_FogCoordd loopback_FogCoorddvEXT => _mesa_FogCoorddv loopback_Indexd => _mesa_Indexd loopback_Indexdv => _mesa_Indexdv loopback_Indexi => _mesa_Indexi loopback_Indexiv => _mesa_Indexiv loopback_Indexs => _mesa_Indexs loopback_Indexsv => _mesa_Indexsv loopback_Indexub => _mesa_Indexub loopback_Indexubv => _mesa_Indexubv loopback_Materialf => _mesa_Materialf loopback_Materiali => _mesa_Materiali loopback_Materialiv => _mesa_Materialiv loopback_MultiTexCoord1dARB => _mesa_MultiTexCoord1d loopback_MultiTexCoord1dvARB => _mesa_MultiTexCoord1dv loopback_MultiTexCoord1iARB => _mesa_MultiTexCoord1i loopback_MultiTexCoord1ivARB => _mesa_MultiTexCoord1iv loopback_MultiTexCoord1sARB => _mesa_MultiTexCoord1s loopback_MultiTexCoord1svARB => _mesa_MultiTexCoord1sv loopback_MultiTexCoord2dARB => _mesa_MultiTexCoord2d loopback_MultiTexCoord2dvARB => _mesa_MultiTexCoord2dv loopback_MultiTexCoord2iARB => _mesa_MultiTexCoord2i loopback_MultiTexCoord2ivARB => _mesa_MultiTexCoord2iv loopback_MultiTexCoord2sARB => _mesa_MultiTexCoord2s loopback_MultiTexCoord2svARB => _mesa_MultiTexCoord2sv loopback_MultiTexCoord3dARB => _mesa_MultiTexCoord3d loopback_MultiTexCoord3dvARB => _mesa_MultiTexCoord3dv loopback_MultiTexCoord3iARB => _mesa_MultiTexCoord3i loopback_MultiTexCoord3ivARB => _mesa_MultiTexCoord3iv loopback_MultiTexCoord3sARB => _mesa_MultiTexCoord3s loopback_MultiTexCoord3svARB => _mesa_MultiTexCoord3sv loopback_MultiTexCoord4dARB => _mesa_MultiTexCoord4d loopback_MultiTexCoord4dvARB => _mesa_MultiTexCoord4dv loopback_MultiTexCoord4iARB => _mesa_MultiTexCoord4i loopback_MultiTexCoord4ivARB => _mesa_MultiTexCoord4iv loopback_MultiTexCoord4sARB => _mesa_MultiTexCoord4s loopback_MultiTexCoord4svARB => _mesa_MultiTexCoord4sv loopback_Normal3b => _mesa_Normal3b loopback_Normal3bv => _mesa_Normal3bv loopback_Normal3d => _mesa_Normal3d loopback_Normal3dv => _mesa_Normal3dv loopback_Normal3i => _mesa_Normal3i loopback_Normal3iv => _mesa_Normal3iv loopback_Normal3s => _mesa_Normal3s loopback_Normal3sv => _mesa_Normal3sv loopback_Rectd => _mesa_Rectd loopback_Rectdv => _mesa_Rectdv loopback_Rectfv => _mesa_Rectfv loopback_Recti => _mesa_Recti loopback_Rectiv => _mesa_Rectiv loopback_Rects => _mesa_Rects loopback_Rectsv => _mesa_Rectsv loopback_SecondaryColor3bEXT_f => _mesa_SecondaryColor3b loopback_SecondaryColor3bvEXT_f => _mesa_SecondaryColor3bv loopback_SecondaryColor3dEXT_f => _mesa_SecondaryColor3d loopback_SecondaryColor3dvEXT_f => _mesa_SecondaryColor3dv loopback_SecondaryColor3iEXT_f => _mesa_SecondaryColor3i loopback_SecondaryColor3ivEXT_f => _mesa_SecondaryColor3iv loopback_SecondaryColor3sEXT_f => _mesa_SecondaryColor3s loopback_SecondaryColor3svEXT_f => _mesa_SecondaryColor3sv loopback_SecondaryColor3ubEXT_f => _mesa_SecondaryColor3ub loopback_SecondaryColor3ubvEXT_f => _mesa_SecondaryColor3ubv loopback_SecondaryColor3uiEXT_f => _mesa_SecondaryColor3ui loopback_SecondaryColor3uivEXT_f => _mesa_SecondaryColor3uiv loopback_SecondaryColor3usEXT_f => _mesa_SecondaryColor3us loopback_SecondaryColor3usvEXT_f => _mesa_SecondaryColor3usv loopback_TexCoord1d => _mesa_TexCoord1d loopback_TexCoord1dv => _mesa_TexCoord1dv loopback_TexCoord1i => _mesa_TexCoord1i loopback_TexCoord1iv => _mesa_TexCoord1iv loopback_TexCoord1s => _mesa_TexCoord1s loopback_TexCoord1sv => _mesa_TexCoord1sv loopback_TexCoord2d => _mesa_TexCoord2d loopback_TexCoord2dv => _mesa_TexCoord2dv loopback_TexCoord2i => _mesa_TexCoord2i loopback_TexCoord2iv => _mesa_TexCoord2iv loopback_TexCoord2s => _mesa_TexCoord2s loopback_TexCoord2sv => _mesa_TexCoord2sv loopback_TexCoord3d => _mesa_TexCoord3d loopback_TexCoord3dv => _mesa_TexCoord3dv loopback_TexCoord3i => _mesa_TexCoord3i loopback_TexCoord3iv => _mesa_TexCoord3iv loopback_TexCoord3s => _mesa_TexCoord3s loopback_TexCoord3sv => _mesa_TexCoord3sv loopback_TexCoord4d => _mesa_TexCoord4d loopback_TexCoord4dv => _mesa_TexCoord4dv loopback_TexCoord4i => _mesa_TexCoord4i loopback_TexCoord4iv => _mesa_TexCoord4iv loopback_TexCoord4s => _mesa_TexCoord4s loopback_TexCoord4sv => _mesa_TexCoord4sv loopback_Vertex2d => _mesa_Vertex2d loopback_Vertex2dv => _mesa_Vertex2dv loopback_Vertex2i => _mesa_Vertex2i loopback_Vertex2iv => _mesa_Vertex2iv loopback_Vertex2s => _mesa_Vertex2s loopback_Vertex2sv => _mesa_Vertex2sv loopback_Vertex3d => _mesa_Vertex3d loopback_Vertex3dv => _mesa_Vertex3dv loopback_Vertex3i => _mesa_Vertex3i loopback_Vertex3iv => _mesa_Vertex3iv loopback_Vertex3s => _mesa_Vertex3s loopback_Vertex3sv => _mesa_Vertex3sv loopback_Vertex4d => _mesa_Vertex4d loopback_Vertex4dv => _mesa_Vertex4dv loopback_Vertex4i => _mesa_Vertex4i loopback_Vertex4iv => _mesa_Vertex4iv loopback_Vertex4s => _mesa_Vertex4s loopback_Vertex4sv => _mesa_Vertex4sv loopback_VertexAttrib1dARB => _mesa_VertexAttrib1d loopback_VertexAttrib1dNV => _mesa_VertexAttrib1dNV loopback_VertexAttrib1dvARB => _mesa_VertexAttrib1dv loopback_VertexAttrib1dvNV => _mesa_VertexAttrib1dvNV loopback_VertexAttrib1sARB => _mesa_VertexAttrib1s loopback_VertexAttrib1sNV => _mesa_VertexAttrib1sNV loopback_VertexAttrib1svARB => _mesa_VertexAttrib1sv loopback_VertexAttrib1svNV => _mesa_VertexAttrib1svNV loopback_VertexAttrib2dARB => _mesa_VertexAttrib2d loopback_VertexAttrib2dNV => _mesa_VertexAttrib2dNV loopback_VertexAttrib2dvARB => _mesa_VertexAttrib2dv loopback_VertexAttrib2dvNV => _mesa_VertexAttrib2dvNV loopback_VertexAttrib2sARB => _mesa_VertexAttrib2s loopback_VertexAttrib2sNV => _mesa_VertexAttrib2sNV loopback_VertexAttrib2svARB => _mesa_VertexAttrib2sv loopback_VertexAttrib2svNV => _mesa_VertexAttrib2svNV loopback_VertexAttrib3dARB => _mesa_VertexAttrib3d loopback_VertexAttrib3dNV => _mesa_VertexAttrib3dNV loopback_VertexAttrib3dvARB => _mesa_VertexAttrib3dv loopback_VertexAttrib3dvNV => _mesa_VertexAttrib3dvNV loopback_VertexAttrib3sARB => _mesa_VertexAttrib3s loopback_VertexAttrib3sNV => _mesa_VertexAttrib3sNV loopback_VertexAttrib3svARB => _mesa_VertexAttrib3sv loopback_VertexAttrib3svNV => _mesa_VertexAttrib3svNV loopback_VertexAttrib4NbvARB => _mesa_VertexAttrib4Nbv loopback_VertexAttrib4NivARB => _mesa_VertexAttrib4Niv loopback_VertexAttrib4NsvARB => _mesa_VertexAttrib4Nsv loopback_VertexAttrib4NubARB => _mesa_VertexAttrib4Nub loopback_VertexAttrib4NubvARB => _mesa_VertexAttrib4Nubv loopback_VertexAttrib4NuivARB => _mesa_VertexAttrib4Nuiv loopback_VertexAttrib4NusvARB => _mesa_VertexAttrib4Nusv loopback_VertexAttrib4bvARB => _mesa_VertexAttrib4bv loopback_VertexAttrib4dARB => _mesa_VertexAttrib4d loopback_VertexAttrib4dNV => _mesa_VertexAttrib4dNV loopback_VertexAttrib4dvARB => _mesa_VertexAttrib4dv loopback_VertexAttrib4dvNV => _mesa_VertexAttrib4dvNV loopback_VertexAttrib4ivARB => _mesa_VertexAttrib4iv loopback_VertexAttrib4sARB => _mesa_VertexAttrib4s loopback_VertexAttrib4sNV => _mesa_VertexAttrib4sNV loopback_VertexAttrib4svARB => _mesa_VertexAttrib4sv loopback_VertexAttrib4svNV => _mesa_VertexAttrib4svNV loopback_VertexAttrib4ubNV => _mesa_VertexAttrib4ubNV loopback_VertexAttrib4ubvARB => _mesa_VertexAttrib4ubv loopback_VertexAttrib4ubvNV => _mesa_VertexAttrib4ubvNV loopback_VertexAttrib4uivARB => _mesa_VertexAttrib4uiv loopback_VertexAttrib4usvARB => _mesa_VertexAttrib4usv loopback_VertexAttribI1iv => _mesa_VertexAttribI1iv loopback_VertexAttribI1uiv => _mesa_VertexAttribI1uiv loopback_VertexAttribI4bv => _mesa_VertexAttribI4bv loopback_VertexAttribI4sv => _mesa_VertexAttribI4sv loopback_VertexAttribI4ubv => _mesa_VertexAttribI4ubv loopback_VertexAttribI4usv => _mesa_VertexAttribI4usv loopback_VertexAttribs1dvNV => _mesa_VertexAttribs1dvNV loopback_VertexAttribs1fvNV => _mesa_VertexAttribs1fvNV loopback_VertexAttribs1svNV => _mesa_VertexAttribs1svNV loopback_VertexAttribs2dvNV => _mesa_VertexAttribs2dvNV loopback_VertexAttribs2fvNV => _mesa_VertexAttribs2fvNV loopback_VertexAttribs2svNV => _mesa_VertexAttribs2svNV loopback_VertexAttribs3dvNV => _mesa_VertexAttribs3dvNV loopback_VertexAttribs3fvNV => _mesa_VertexAttribs3fvNV loopback_VertexAttribs3svNV => _mesa_VertexAttribs3svNV loopback_VertexAttribs4dvNV => _mesa_VertexAttribs4dvNV loopback_VertexAttribs4fvNV => _mesa_VertexAttribs4fvNV loopback_VertexAttribs4svNV => _mesa_VertexAttribs4svNV loopback_VertexAttribs4ubvNV => _mesa_VertexAttribs4ubvNV And changes the primary name assignment in the XML as follows: ActiveTextureARB => ActiveTexture AlphaFuncxOES => AlphaFuncx BeginConditionalRenderNV => BeginConditionalRender BeginQueryARB => BeginQuery BeginTransformFeedbackEXT => BeginTransformFeedback BindAttribLocationARB => BindAttribLocation BindBufferARB => BindBuffer BindBufferBaseEXT => BindBufferBase BindBufferRangeEXT => BindBufferRange BindFragDataLocationEXT => BindFragDataLocation BindFramebufferEXT => BindFramebuffer BindProgramNV => BindProgramARB BindRenderbufferEXT => BindRenderbuffer BlendEquationSeparateEXT => BlendEquationSeparate BlendFuncSeparateEXT => BlendFuncSeparate BlitFramebufferEXT => BlitFramebuffer BufferDataARB => BufferData BufferSubDataARB => BufferSubData CheckFramebufferStatusEXT => CheckFramebufferStatus ClampColorARB => ClampColor ClearColorxOES => ClearColorx ClearDepthxOES => ClearDepthx ClientActiveTextureARB => ClientActiveTexture ClipPlanefOES => ClipPlanef ClipPlanexOES => ClipPlanex Color4xOES => Color4x ColorMaskIndexedEXT => ColorMaski CompileShaderARB => CompileShader CompressedTexImage1DARB => CompressedTexImage1D CompressedTexImage2DARB => CompressedTexImage2D CompressedTexImage3DARB => CompressedTexImage3D CompressedTexSubImage1DARB => CompressedTexSubImage1D CompressedTexSubImage2DARB => CompressedTexSubImage2D CompressedTexSubImage3DARB => CompressedTexSubImage3D DeleteBuffersARB => DeleteBuffers DeleteFramebuffersEXT => DeleteFramebuffers DeleteProgramsNV => DeleteProgramsARB DeleteQueriesARB => DeleteQueries DeleteRenderbuffersEXT => DeleteRenderbuffers DeleteVertexArraysAPPLE => DeleteVertexArrays DepthRangexOES => DepthRangex DisableIndexedEXT => Disablei DisableVertexAttribArrayARB => DisableVertexAttribArray DrawBuffersARB => DrawBuffers EnableIndexedEXT => Enablei EnableVertexAttribArrayARB => EnableVertexAttribArray EndConditionalRenderNV => EndConditionalRender EndQueryARB => EndQuery EndTransformFeedbackEXT => EndTransformFeedback FogCoordPointerEXT => FogCoordPointer FogCoorddEXT => FogCoordd FogCoorddvEXT => FogCoorddv FogxOES => Fogx FogxvOES => Fogxv FramebufferRenderbufferEXT => FramebufferRenderbuffer FramebufferTexture1DEXT => FramebufferTexture1D FramebufferTexture2DEXT => FramebufferTexture2D FramebufferTexture3DEXT => FramebufferTexture3D FramebufferTextureLayerEXT => FramebufferTextureLayer FrustumfOES => Frustumf FrustumxOES => Frustumx GenBuffersARB => GenBuffers GenFramebuffersEXT => GenFramebuffers GenProgramsNV => GenProgramsARB GenQueriesARB => GenQueries GenRenderbuffersEXT => GenRenderbuffers GenerateMipmapEXT => GenerateMipmap GetActiveAttribARB => GetActiveAttrib GetActiveUniformARB => GetActiveUniform GetAttribLocationARB => GetAttribLocation GetBooleanIndexedvEXT => GetBooleani_v GetBufferParameterivARB => GetBufferParameteriv GetBufferPointervARB => GetBufferPointerv GetBufferSubDataARB => GetBufferSubData GetClipPlanefOES => GetClipPlanef GetClipPlanexOES => GetClipPlanex GetCompressedTexImageARB => GetCompressedTexImage GetFixedvOES => GetFixedv GetFragDataLocationEXT => GetFragDataLocation GetFramebufferAttachmentParameterivEXT => GetFramebufferAttachmentParameteriv GetIntegerIndexedvEXT => GetIntegeri_v GetLightxvOES => GetLightxv GetMaterialxvOES => GetMaterialxv GetQueryObjecti64vEXT => GetQueryObjecti64v GetQueryObjectivARB => GetQueryObjectiv GetQueryObjectui64vEXT => GetQueryObjectui64v GetQueryObjectuivARB => GetQueryObjectuiv GetQueryivARB => GetQueryiv GetRenderbufferParameterivEXT => GetRenderbufferParameteriv GetShaderSourceARB => GetShaderSource GetTexEnvxvOES => GetTexEnvxv GetTexParameterIivEXT => GetTexParameterIiv GetTexParameterIuivEXT => GetTexParameterIuiv GetTexParameterxvOES => GetTexParameterxv GetTransformFeedbackVaryingEXT => GetTransformFeedbackVarying GetUniformLocationARB => GetUniformLocation GetUniformfvARB => GetUniformfv GetUniformivARB => GetUniformiv GetUniformuivEXT => GetUniformuiv GetVertexAttribIivEXT => GetVertexAttribIiv GetVertexAttribIuivEXT => GetVertexAttribIuiv GetVertexAttribPointervNV => GetVertexAttribPointerv GetVertexAttribdvARB => GetVertexAttribdv GetVertexAttribfvARB => GetVertexAttribfv GetVertexAttribivARB => GetVertexAttribiv IsBufferARB => IsBuffer IsEnabledIndexedEXT => IsEnabledi IsFramebufferEXT => IsFramebuffer IsProgramNV => IsProgramARB IsQueryARB => IsQuery IsRenderbufferEXT => IsRenderbuffer IsVertexArrayAPPLE => IsVertexArray LightModelxOES => LightModelx LightModelxvOES => LightModelxv LightxOES => Lightx LightxvOES => Lightxv LineWidthxOES => LineWidthx LinkProgramARB => LinkProgram LoadMatrixxOES => LoadMatrixx LoadTransposeMatrixdARB => LoadTransposeMatrixd LoadTransposeMatrixfARB => LoadTransposeMatrixf MapBufferARB => MapBuffer MaterialxOES => Materialx MaterialxvOES => Materialxv MultMatrixxOES => MultMatrixx MultTransposeMatrixdARB => MultTransposeMatrixd MultTransposeMatrixfARB => MultTransposeMatrixf MultiDrawArraysEXT => MultiDrawArrays MultiTexCoord1dARB => MultiTexCoord1d MultiTexCoord1dvARB => MultiTexCoord1dv MultiTexCoord1iARB => MultiTexCoord1i MultiTexCoord1ivARB => MultiTexCoord1iv MultiTexCoord1sARB => MultiTexCoord1s MultiTexCoord1svARB => MultiTexCoord1sv MultiTexCoord2dARB => MultiTexCoord2d MultiTexCoord2dvARB => MultiTexCoord2dv MultiTexCoord2iARB => MultiTexCoord2i MultiTexCoord2ivARB => MultiTexCoord2iv MultiTexCoord2sARB => MultiTexCoord2s MultiTexCoord2svARB => MultiTexCoord2sv MultiTexCoord3dARB => MultiTexCoord3d MultiTexCoord3dvARB => MultiTexCoord3dv MultiTexCoord3iARB => MultiTexCoord3i MultiTexCoord3ivARB => MultiTexCoord3iv MultiTexCoord3sARB => MultiTexCoord3s MultiTexCoord3svARB => MultiTexCoord3sv MultiTexCoord4dARB => MultiTexCoord4d MultiTexCoord4dvARB => MultiTexCoord4dv MultiTexCoord4iARB => MultiTexCoord4i MultiTexCoord4ivARB => MultiTexCoord4iv MultiTexCoord4sARB => MultiTexCoord4s MultiTexCoord4svARB => MultiTexCoord4sv MultiTexCoord4xOES => MultiTexCoord4x Normal3xOES => Normal3x OrthofOES => Orthof OrthoxOES => Orthox PointParameterfEXT => PointParameterf PointParameterfvEXT => PointParameterfv PointParameteriNV => PointParameteri PointParameterivNV => PointParameteriv PointParameterxOES => PointParameterx PointParameterxvOES => PointParameterxv PointSizexOES => PointSizex PolygonOffsetxOES => PolygonOffsetx PrimitiveRestartIndexNV => PrimitiveRestartIndex ProvokingVertexEXT => ProvokingVertex RenderbufferStorageEXT => RenderbufferStorage RotatexOES => Rotatex SampleCoverageARB => SampleCoverage SampleCoveragexOES => SampleCoveragex ScalexOES => Scalex SecondaryColor3bEXT => SecondaryColor3b SecondaryColor3bvEXT => SecondaryColor3bv SecondaryColor3dEXT => SecondaryColor3d SecondaryColor3dvEXT => SecondaryColor3dv SecondaryColor3iEXT => SecondaryColor3i SecondaryColor3ivEXT => SecondaryColor3iv SecondaryColor3sEXT => SecondaryColor3s SecondaryColor3svEXT => SecondaryColor3sv SecondaryColor3ubEXT => SecondaryColor3ub SecondaryColor3ubvEXT => SecondaryColor3ubv SecondaryColor3uiEXT => SecondaryColor3ui SecondaryColor3uivEXT => SecondaryColor3uiv SecondaryColor3usEXT => SecondaryColor3us SecondaryColor3usvEXT => SecondaryColor3usv SecondaryColorPointerEXT => SecondaryColorPointer ShaderSourceARB => ShaderSource TexBufferARB => TexBuffer TexEnvxOES => TexEnvx TexEnvxvOES => TexEnvxv TexParameterIivEXT => TexParameterIiv TexParameterIuivEXT => TexParameterIuiv TexParameterxOES => TexParameterx TexParameterxvOES => TexParameterxv TransformFeedbackVaryingsEXT => TransformFeedbackVaryings TranslatexOES => Translatex Uniform1fARB => Uniform1f Uniform1fvARB => Uniform1fv Uniform1iARB => Uniform1i Uniform1ivARB => Uniform1iv Uniform1uiEXT => Uniform1ui Uniform1uivEXT => Uniform1uiv Uniform2fARB => Uniform2f Uniform2fvARB => Uniform2fv Uniform2iARB => Uniform2i Uniform2ivARB => Uniform2iv Uniform2uiEXT => Uniform2ui Uniform2uivEXT => Uniform2uiv Uniform3fARB => Uniform3f Uniform3fvARB => Uniform3fv Uniform3iARB => Uniform3i Uniform3ivARB => Uniform3iv Uniform3uiEXT => Uniform3ui Uniform3uivEXT => Uniform3uiv Uniform4fARB => Uniform4f Uniform4fvARB => Uniform4fv Uniform4iARB => Uniform4i Uniform4ivARB => Uniform4iv Uniform4uiEXT => Uniform4ui Uniform4uivEXT => Uniform4uiv UniformMatrix2fvARB => UniformMatrix2fv UniformMatrix3fvARB => UniformMatrix3fv UniformMatrix4fvARB => UniformMatrix4fv UnmapBufferARB => UnmapBuffer UseProgramObjectARB => UseProgram ValidateProgramARB => ValidateProgram VertexAttrib1dARB => VertexAttrib1d VertexAttrib1dvARB => VertexAttrib1dv VertexAttrib1sARB => VertexAttrib1s VertexAttrib1svARB => VertexAttrib1sv VertexAttrib2dARB => VertexAttrib2d VertexAttrib2dvARB => VertexAttrib2dv VertexAttrib2sARB => VertexAttrib2s VertexAttrib2svARB => VertexAttrib2sv VertexAttrib3dARB => VertexAttrib3d VertexAttrib3dvARB => VertexAttrib3dv VertexAttrib3sARB => VertexAttrib3s VertexAttrib3svARB => VertexAttrib3sv VertexAttrib4NbvARB => VertexAttrib4Nbv VertexAttrib4NivARB => VertexAttrib4Niv VertexAttrib4NsvARB => VertexAttrib4Nsv VertexAttrib4NubARB => VertexAttrib4Nub VertexAttrib4NubvARB => VertexAttrib4Nubv VertexAttrib4NuivARB => VertexAttrib4Nuiv VertexAttrib4NusvARB => VertexAttrib4Nusv VertexAttrib4bvARB => VertexAttrib4bv VertexAttrib4dARB => VertexAttrib4d VertexAttrib4dvARB => VertexAttrib4dv VertexAttrib4ivARB => VertexAttrib4iv VertexAttrib4sARB => VertexAttrib4s VertexAttrib4svARB => VertexAttrib4sv VertexAttrib4ubvARB => VertexAttrib4ubv VertexAttrib4uivARB => VertexAttrib4uiv VertexAttrib4usvARB => VertexAttrib4usv VertexAttribDivisorARB => VertexAttribDivisor VertexAttribI1ivEXT => VertexAttribI1iv VertexAttribI1uivEXT => VertexAttribI1uiv VertexAttribI4bvEXT => VertexAttribI4bv VertexAttribI4svEXT => VertexAttribI4sv VertexAttribI4ubvEXT => VertexAttribI4ubv VertexAttribI4usvEXT => VertexAttribI4usv VertexAttribIPointerEXT => VertexAttribIPointer VertexAttribPointerARB => VertexAttribPointer WindowPos2dMESA => WindowPos2d WindowPos2dvMESA => WindowPos2dv WindowPos2fMESA => WindowPos2f WindowPos2fvMESA => WindowPos2fv WindowPos2iMESA => WindowPos2i WindowPos2ivMESA => WindowPos2iv WindowPos2sMESA => WindowPos2s WindowPos2svMESA => WindowPos2sv WindowPos3dMESA => WindowPos3d WindowPos3dvMESA => WindowPos3dv WindowPos3fMESA => WindowPos3f WindowPos3fvMESA => WindowPos3fv WindowPos3iMESA => WindowPos3i WindowPos3ivMESA => WindowPos3iv WindowPos3sMESA => WindowPos3s WindowPos3svMESA => WindowPos3sv Acked-by: Brian Paul <[email protected]>
author: Paul Berry <[email protected]> 2012-11-06 08:57:59 -0800
committer: Paul Berry <[email protected]> 2012-11-12 10:53:57 -0800
commit: 1a1db1746db82efc7f0643508886dfc78a15eb71 (patch)
tree: 7f5c19176974df05a9d2e54fe20fe2bb6d346bfa /src/mesa/main
parent: 7708a864648aecd8aafb484ec7db18c2aba9e957 (diff)
52 files changed, 1334 insertions, 1334 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 20b8ff4d1c7..0fa2429976b 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v)
 static void GLAPIENTRY
 VertexAttrib1dvARB(GLuint index, const GLdouble *v)
 {
-   CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));
+   CALL_VertexAttrib1dv(GET_DISPATCH(), (index, v));
 }
 
 static void GLAPIENTRY
 VertexAttrib2dvARB(GLuint index, const GLdouble *v)
 {
-   CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));
+   CALL_VertexAttrib2dv(GET_DISPATCH(), (index, v));
 }
 
 static void GLAPIENTRY
 VertexAttrib3dvARB(GLuint index, const GLdouble *v)
 {
-   CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));
+   CALL_VertexAttrib3dv(GET_DISPATCH(), (index, v));
 }
 
 static void GLAPIENTRY
 VertexAttrib4dvARB(GLuint index, const GLdouble *v)
 {
-   CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));
+   CALL_VertexAttrib4dv(GET_DISPATCH(), (index, v));
 }
 
 
@@ -1114,7 +1114,7 @@ VertexAttribI3bv(GLuint index, const GLbyte *v)
 static void GLAPIENTRY
 VertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-   CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));
+   CALL_VertexAttribI4bv(GET_DISPATCH(), (index, v));
 }
 
 
@@ -1139,7 +1139,7 @@ VertexAttribI3ubv(GLuint index, const GLubyte *v)
 static void GLAPIENTRY
 VertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-   CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));
+   CALL_VertexAttribI4ubv(GET_DISPATCH(), (index, v));
 }
 
 
@@ -1165,7 +1165,7 @@ VertexAttribI3sv(GLuint index, const GLshort *v)
 static void GLAPIENTRY
 VertexAttribI4sv(GLuint index, const GLshort *v)
 {
-   CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));
+   CALL_VertexAttribI4sv(GET_DISPATCH(), (index, v));
 }
 
 
@@ -1190,7 +1190,7 @@ VertexAttribI3usv(GLuint index, const GLushort *v)
 static void GLAPIENTRY
 VertexAttribI4usv(GLuint index, const GLushort *v)
 {
-   CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));
+   CALL_VertexAttribI4usv(GET_DISPATCH(), (index, v));
 }
 
 
@@ -1405,14 +1405,14 @@ GLboolean _ae_create_context( struct gl_context *ctx )
       return GL_TRUE;
 
    /* These _gloffset_* values may not be compile-time constants */
-   SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;
-   SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;
-   SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;
-   SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;
-   SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;
-   SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;
+   SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bv;
+   SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubv;
+   SecondaryColorFuncs[2] = _gloffset_SecondaryColor3sv;
+   SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usv;
+   SecondaryColorFuncs[4] = _gloffset_SecondaryColor3iv;
+   SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uiv;
    SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;
-   SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;
+   SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dv;
 
    FogCoordFuncs[0] = -1;
    FogCoordFuncs[1] = -1;
@@ -1421,7 +1421,7 @@ GLboolean _ae_create_context( struct gl_context *ctx )
    FogCoordFuncs[4] = -1;
    FogCoordFuncs[5] = -1;
    FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
-   FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
+   FogCoordFuncs[7] = _gloffset_FogCoorddv;
 
    ctx->aelt_context = calloc(1, sizeof(AEcontext));
    if (!ctx->aelt_context)
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 33155308640..6b66319a9e4 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -88,7 +88,7 @@
 
 
 void GLAPIENTRY
-loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
+_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue )
 {
    COLORF( BYTE_TO_FLOAT(red),
 	   BYTE_TO_FLOAT(green),
@@ -97,41 +97,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
 }
 
 void GLAPIENTRY
-loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue )
+_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue )
 {
    COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3i_f( GLint red, GLint green, GLint blue )
+_mesa_Color3i( GLint red, GLint green, GLint blue )
 {
    COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
 	   INT_TO_FLOAT(blue), 1.0);
 }
 
 void GLAPIENTRY
-loopback_Color3s_f( GLshort red, GLshort green, GLshort blue )
+_mesa_Color3s( GLshort red, GLshort green, GLshort blue )
 {
    COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
 	   SHORT_TO_FLOAT(blue), 1.0);
 }
 
 void GLAPIENTRY
-loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue )
+_mesa_Color3ui( GLuint red, GLuint green, GLuint blue )
 {
    COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
 	   UINT_TO_FLOAT(blue), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3us_f( GLushort red, GLushort green, GLushort blue )
+_mesa_Color3us( GLushort red, GLushort green, GLushort blue )
 {
    COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
 	   USHORT_TO_FLOAT(blue), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
+_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue )
 {
    COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
 	   UBYTE_TO_FLOAT(blue), 1.0 );
@@ -139,48 +139,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
 
 
 void GLAPIENTRY
-loopback_Color3bv_f( const GLbyte *v )
+_mesa_Color3bv( const GLbyte *v )
 {
    COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
 	   BYTE_TO_FLOAT(v[2]), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3dv_f( const GLdouble *v )
+_mesa_Color3dv( const GLdouble *v )
 {
    COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3iv_f( const GLint *v )
+_mesa_Color3iv( const GLint *v )
 {
    COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
 	   INT_TO_FLOAT(v[2]), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3sv_f( const GLshort *v )
+_mesa_Color3sv( const GLshort *v )
 {
    COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
 	   SHORT_TO_FLOAT(v[2]), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3uiv_f( const GLuint *v )
+_mesa_Color3uiv( const GLuint *v )
 {
    COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
 	   UINT_TO_FLOAT(v[2]), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3usv_f( const GLushort *v )
+_mesa_Color3usv( const GLushort *v )
 {
    COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
 	   USHORT_TO_FLOAT(v[2]), 1.0 );
 }
 
 void GLAPIENTRY
-loopback_Color3ubv_f( const GLubyte *v )
+_mesa_Color3ubv( const GLubyte *v )
 {
    COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
 	   UBYTE_TO_FLOAT(v[2]), 1.0 );
@@ -188,7 +188,7 @@ loopback_Color3ubv_f( const GLubyte *v )
 
 
 void GLAPIENTRY
-loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
+_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue,
 			      GLbyte alpha )
 {
    COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green),
@@ -196,21 +196,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
 }
 
 void GLAPIENTRY
-loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
+_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue,
 			      GLdouble alpha )
 {
    COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha );
 }
 
 void GLAPIENTRY
-loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha )
+_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha )
 {
    COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
 	   INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) );
 }
 
 void GLAPIENTRY
-loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
+_mesa_Color4s( GLshort red, GLshort green, GLshort blue,
 			      GLshort alpha )
 {
    COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
@@ -218,21 +218,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
 }
 
 void GLAPIENTRY
-loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha )
+_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha )
 {
    COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
 	   UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) );
 }
 
 void GLAPIENTRY
-loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha )
+_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha )
 {
    COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
 	   USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) );
 }
 
 void GLAPIENTRY
-loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
 {
    COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
 	   UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) );
@@ -240,7 +240,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
 
 
 void GLAPIENTRY
-loopback_Color4iv_f( const GLint *v )
+_mesa_Color4iv( const GLint *v )
 {
    COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
 	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
@@ -248,21 +248,21 @@ loopback_Color4iv_f( const GLint *v )
 
 
 void GLAPIENTRY
-loopback_Color4bv_f( const GLbyte *v )
+_mesa_Color4bv( const GLbyte *v )
 {
    COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
 	   BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) );
 }
 
 void GLAPIENTRY
-loopback_Color4dv_f( const GLdouble *v )
+_mesa_Color4dv( const GLdouble *v )
 {
    COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 
 void GLAPIENTRY
-loopback_Color4sv_f( const GLshort *v)
+_mesa_Color4sv( const GLshort *v)
 {
    COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
 	   SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) );
@@ -270,21 +270,21 @@ loopback_Color4sv_f( const GLshort *v)
 
 
 void GLAPIENTRY
-loopback_Color4uiv_f( const GLuint *v)
+_mesa_Color4uiv( const GLuint *v)
 {
    COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
 	   UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) );
 }
 
 void GLAPIENTRY
-loopback_Color4usv_f( const GLushort *v)
+_mesa_Color4usv( const GLushort *v)
 {
    COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
 	   USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) );
 }
 
 void GLAPIENTRY
-loopback_Color4ubv_f( const GLubyte *v)
+_mesa_Color4ubv( const GLubyte *v)
 {
    COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
 	   UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) );
@@ -292,565 +292,565 @@ loopback_Color4ubv_f( const GLubyte *v)
 
 
 void GLAPIENTRY
-loopback_FogCoorddEXT( GLdouble d )
+_mesa_FogCoordd( GLdouble d )
 {
    FOGCOORDF( (GLfloat) d );
 }
 
 void GLAPIENTRY
-loopback_FogCoorddvEXT( const GLdouble *v )
+_mesa_FogCoorddv( const GLdouble *v )
 {
    FOGCOORDF( (GLfloat) *v );
 }
 
 
 void GLAPIENTRY
-loopback_Indexd( GLdouble c )
+_mesa_Indexd( GLdouble c )
 {
    INDEX( (GLfloat) c );
 }
 
 void GLAPIENTRY
-loopback_Indexi( GLint c )
+_mesa_Indexi( GLint c )
 {
    INDEX( (GLfloat) c );
 }
 
 void GLAPIENTRY
-loopback_Indexs( GLshort c )
+_mesa_Indexs( GLshort c )
 {
    INDEX( (GLfloat) c );
 }
 
 void GLAPIENTRY
-loopback_Indexub( GLubyte c )
+_mesa_Indexub( GLubyte c )
 {
    INDEX( (GLfloat) c );
 }
 
 void GLAPIENTRY
-loopback_Indexdv( const GLdouble *c )
+_mesa_Indexdv( const GLdouble *c )
 {
    INDEX( (GLfloat) *c );
 }
 
 void GLAPIENTRY
-loopback_Indexiv( const GLint *c )
+_mesa_Indexiv( const GLint *c )
 {
    INDEX( (GLfloat) *c );
 }
 
 void GLAPIENTRY
-loopback_Indexsv( const GLshort *c )
+_mesa_Indexsv( const GLshort *c )
 {
    INDEX( (GLfloat) *c );
 }
 
 void GLAPIENTRY
-loopback_Indexubv( const GLubyte *c )
+_mesa_Indexubv( const GLubyte *c )
 {
    INDEX( (GLfloat) *c );
 }
 
 
 void GLAPIENTRY
-loopback_EdgeFlagv(const GLboolean *flag)
+_mesa_EdgeFlagv(const GLboolean *flag)
 {
    CALL_EdgeFlag(GET_DISPATCH(), (*flag));
 }
 
 
 void GLAPIENTRY
-loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
+_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
 {
    NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) );
 }
 
 void GLAPIENTRY
-loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
+_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
 {
    NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz);
 }
 
 void GLAPIENTRY
-loopback_Normal3i( GLint nx, GLint ny, GLint nz )
+_mesa_Normal3i( GLint nx, GLint ny, GLint nz )
 {
    NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) );
 }
 
 void GLAPIENTRY
-loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz )
+_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz )
 {
    NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) );
 }
 
 void GLAPIENTRY
-loopback_Normal3bv( const GLbyte *v )
+_mesa_Normal3bv( const GLbyte *v )
 {
    NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) );
 }
 
 void GLAPIENTRY
-loopback_Normal3dv( const GLdouble *v )
+_mesa_Normal3dv( const GLdouble *v )
 {
    NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_Normal3iv( const GLint *v )
+_mesa_Normal3iv( const GLint *v )
 {
    NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) );
 }
 
 void GLAPIENTRY
-loopback_Normal3sv( const GLshort *v )
+_mesa_Normal3sv( const GLshort *v )
 {
    NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) );
 }
 
 void GLAPIENTRY
-loopback_TexCoord1d( GLdouble s )
+_mesa_TexCoord1d( GLdouble s )
 {
    TEXCOORD1((GLfloat) s);
 }
 
 void GLAPIENTRY
-loopback_TexCoord1i( GLint s )
+_mesa_TexCoord1i( GLint s )
 {
    TEXCOORD1((GLfloat) s);
 }
 
 void GLAPIENTRY
-loopback_TexCoord1s( GLshort s )
+_mesa_TexCoord1s( GLshort s )
 {
    TEXCOORD1((GLfloat) s);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2d( GLdouble s, GLdouble t )
+_mesa_TexCoord2d( GLdouble s, GLdouble t )
 {
    TEXCOORD2((GLfloat) s,(GLfloat) t);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2s( GLshort s, GLshort t )
+_mesa_TexCoord2s( GLshort s, GLshort t )
 {
    TEXCOORD2((GLfloat) s,(GLfloat) t);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2i( GLint s, GLint t )
+_mesa_TexCoord2i( GLint s, GLint t )
 {
    TEXCOORD2((GLfloat) s,(GLfloat) t);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
+_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
 {
    TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3i( GLint s, GLint t, GLint r )
+_mesa_TexCoord3i( GLint s, GLint t, GLint r )
 {
    TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3s( GLshort s, GLshort t, GLshort r )
+_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r )
 {
    TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
+_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
 {
    TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
+_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
 {
    TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
+_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
 {
    TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
 }
 
 void GLAPIENTRY
-loopback_TexCoord1dv( const GLdouble *v )
+_mesa_TexCoord1dv( const GLdouble *v )
 {
    TEXCOORD1((GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord1iv( const GLint *v )
+_mesa_TexCoord1iv( const GLint *v )
 {
    TEXCOORD1((GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord1sv( const GLshort *v )
+_mesa_TexCoord1sv( const GLshort *v )
 {
    TEXCOORD1((GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2dv( const GLdouble *v )
+_mesa_TexCoord2dv( const GLdouble *v )
 {
    TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2iv( const GLint *v )
+_mesa_TexCoord2iv( const GLint *v )
 {
    TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord2sv( const GLshort *v )
+_mesa_TexCoord2sv( const GLshort *v )
 {
    TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3dv( const GLdouble *v )
+_mesa_TexCoord3dv( const GLdouble *v )
 {
    TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3iv( const GLint *v )
+_mesa_TexCoord3iv( const GLint *v )
 {
    TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord3sv( const GLshort *v )
+_mesa_TexCoord3sv( const GLshort *v )
 {
    TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4dv( const GLdouble *v )
+_mesa_TexCoord4dv( const GLdouble *v )
 {
    TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4iv( const GLint *v )
+_mesa_TexCoord4iv( const GLint *v )
 {
    TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_TexCoord4sv( const GLshort *v )
+_mesa_TexCoord4sv( const GLshort *v )
 {
    TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_Vertex2d( GLdouble x, GLdouble y )
+_mesa_Vertex2d( GLdouble x, GLdouble y )
 {
    VERTEX2( (GLfloat) x, (GLfloat) y );
 }
 
 void GLAPIENTRY
-loopback_Vertex2i( GLint x, GLint y )
+_mesa_Vertex2i( GLint x, GLint y )
 {
    VERTEX2( (GLfloat) x, (GLfloat) y );
 }
 
 void GLAPIENTRY
-loopback_Vertex2s( GLshort x, GLshort y )
+_mesa_Vertex2s( GLshort x, GLshort y )
 {
    VERTEX2( (GLfloat) x, (GLfloat) y );
 }
 
 void GLAPIENTRY
-loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
+_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
 {
    VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
 }
 
 void GLAPIENTRY
-loopback_Vertex3i( GLint x, GLint y, GLint z )
+_mesa_Vertex3i( GLint x, GLint y, GLint z )
 {
    VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
 }
 
 void GLAPIENTRY
-loopback_Vertex3s( GLshort x, GLshort y, GLshort z )
+_mesa_Vertex3s( GLshort x, GLshort y, GLshort z )
 {
    VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
 }
 
 void GLAPIENTRY
-loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
+_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
 {
    VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
 }
 
 void GLAPIENTRY
-loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w )
+_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w )
 {
    VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
 }
 
 void GLAPIENTRY
-loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
+_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
 {
    VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
 }
 
 void GLAPIENTRY
-loopback_Vertex2dv( const GLdouble *v )
+_mesa_Vertex2dv( const GLdouble *v )
 {
    VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_Vertex2iv( const GLint *v )
+_mesa_Vertex2iv( const GLint *v )
 {
    VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_Vertex2sv( const GLshort *v )
+_mesa_Vertex2sv( const GLshort *v )
 {
    VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_Vertex3dv( const GLdouble *v )
+_mesa_Vertex3dv( const GLdouble *v )
 {
    VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_Vertex3iv( const GLint *v )
+_mesa_Vertex3iv( const GLint *v )
 {
    VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_Vertex3sv( const GLshort *v )
+_mesa_Vertex3sv( const GLshort *v )
 {
    VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_Vertex4dv( const GLdouble *v )
+_mesa_Vertex4dv( const GLdouble *v )
 {
    VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
 	    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_Vertex4iv( const GLint *v )
+_mesa_Vertex4iv( const GLint *v )
 {
    VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
 	    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_Vertex4sv( const GLshort *v )
+_mesa_Vertex4sv( const GLshort *v )
 {
    VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
 	    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1dARB(GLenum target, GLdouble s)
+_mesa_MultiTexCoord1d(GLenum target, GLdouble s)
 {
    MULTI_TEXCOORD1( target, (GLfloat) s );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
    MULTI_TEXCOORD1( target, (GLfloat) v[0] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1iARB(GLenum target, GLint s)
+_mesa_MultiTexCoord1i(GLenum target, GLint s)
 {
    MULTI_TEXCOORD1( target, (GLfloat) s );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord1iv(GLenum target, const GLint *v)
 {
    MULTI_TEXCOORD1( target, (GLfloat) v[0] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1sARB(GLenum target, GLshort s)
+_mesa_MultiTexCoord1s(GLenum target, GLshort s)
 {
    MULTI_TEXCOORD1( target, (GLfloat) s );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v)
 {
    MULTI_TEXCOORD1( target, (GLfloat) v[0] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)
+_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
    MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
    MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t)
+_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
    MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord2iv(GLenum target, const GLint *v)
 {
    MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)
+_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
    MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v)
 {
    MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
    MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
    MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)
+_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
    MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord3iv(GLenum target, const GLint *v)
 {
    MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)
+_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
    MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v)
 {
    MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
    MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, 
 		    (GLfloat) r, (GLfloat) q );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
    MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], 
 		    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)
+_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
    MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
 		    (GLfloat) r, (GLfloat) q );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord4iv(GLenum target, const GLint *v)
 {
    MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
 		    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
    MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
 		    (GLfloat) r, (GLfloat) q );
 }
 
 void GLAPIENTRY
-loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v)
 {
    MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
 		    (GLfloat) v[2], (GLfloat) v[3] );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord2dv( const GLdouble *u )
+_mesa_EvalCoord2dv( const GLdouble *u )
 {
    EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord2fv( const GLfloat *u )
+_mesa_EvalCoord2fv( const GLfloat *u )
 {
    EVALCOORD2( u[0], u[1] );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord2d( GLdouble u, GLdouble v )
+_mesa_EvalCoord2d( GLdouble u, GLdouble v )
 {
    EVALCOORD2( (GLfloat) u, (GLfloat) v );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord1dv( const GLdouble *u )
+_mesa_EvalCoord1dv( const GLdouble *u )
 {
    EVALCOORD1( (GLfloat) *u );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord1fv( const GLfloat *u )
+_mesa_EvalCoord1fv( const GLfloat *u )
 {
    EVALCOORD1( (GLfloat) *u );
 }
 
 void GLAPIENTRY
-loopback_EvalCoord1d( GLdouble u )
+_mesa_EvalCoord1d( GLdouble u )
 {
    EVALCOORD1( (GLfloat) u );
 }
 
 void GLAPIENTRY
-loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
+_mesa_Materialf( GLenum face, GLenum pname, GLfloat param )
 {
    GLfloat fparam[4];
    fparam[0] = param;
@@ -858,14 +858,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
 }
 
 void GLAPIENTRY
-loopback_Materiali(GLenum face, GLenum pname, GLint param )
+_mesa_Materiali(GLenum face, GLenum pname, GLint param )
 {
    GLfloat p = (GLfloat) param;
    MATERIALFV(face, pname, &p);
 }
 
 void GLAPIENTRY
-loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
+_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params )
 {
    GLfloat fparam[4];
    switch (pname) {
@@ -895,49 +895,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
 
 
 void GLAPIENTRY
-loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
    RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
 }
 
 void GLAPIENTRY
-loopback_Rectdv(const GLdouble *v1, const GLdouble *v2)
+_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2)
 {
    RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
 }
 
 void GLAPIENTRY
-loopback_Rectfv(const GLfloat *v1, const GLfloat *v2)
+_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2)
 {
    RECTF(v1[0], v1[1], v2[0], v2[1]);
 }
 
 void GLAPIENTRY
-loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
+_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
    RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
 }
 
 void GLAPIENTRY
-loopback_Rectiv(const GLint *v1, const GLint *v2)
+_mesa_Rectiv(const GLint *v1, const GLint *v2)
 {
    RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
 }
 
 void GLAPIENTRY
-loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
+_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
    RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
 }
 
 void GLAPIENTRY
-loopback_Rectsv(const GLshort *v1, const GLshort *v2)
+_mesa_Rectsv(const GLshort *v1, const GLshort *v2)
 {
    RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
+_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue )
 {
    SECONDARYCOLORF( BYTE_TO_FLOAT(red),
 		    BYTE_TO_FLOAT(green),
@@ -945,13 +945,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue )
+_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue )
 {
    SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue );
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
+_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue )
 {
    SECONDARYCOLORF( INT_TO_FLOAT(red),
 		    INT_TO_FLOAT(green),
@@ -959,7 +959,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
+_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue )
 {
    SECONDARYCOLORF(SHORT_TO_FLOAT(red),
                    SHORT_TO_FLOAT(green),
@@ -967,7 +967,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
+_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue )
 {
    SECONDARYCOLORF(UINT_TO_FLOAT(red),
                    UINT_TO_FLOAT(green),
@@ -975,7 +975,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
+_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue )
 {
    SECONDARYCOLORF(USHORT_TO_FLOAT(red),
                    USHORT_TO_FLOAT(green),
@@ -983,7 +983,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
+_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue )
 {
    SECONDARYCOLORF(UBYTE_TO_FLOAT(red),
                    UBYTE_TO_FLOAT(green),
@@ -991,7 +991,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
+_mesa_SecondaryColor3bv( const GLbyte *v )
 {
    SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]),
                    BYTE_TO_FLOAT(v[1]),
@@ -999,12 +999,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3dvEXT_f( const GLdouble *v )
+_mesa_SecondaryColor3dv( const GLdouble *v )
 {
    SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
 }
 void GLAPIENTRY
-loopback_SecondaryColor3ivEXT_f( const GLint *v )
+_mesa_SecondaryColor3iv( const GLint *v )
 {
    SECONDARYCOLORF(INT_TO_FLOAT(v[0]),
                    INT_TO_FLOAT(v[1]),
@@ -1012,7 +1012,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3svEXT_f( const GLshort *v )
+_mesa_SecondaryColor3sv( const GLshort *v )
 {
    SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]),
                    SHORT_TO_FLOAT(v[1]),
@@ -1020,7 +1020,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3uivEXT_f( const GLuint *v )
+_mesa_SecondaryColor3uiv( const GLuint *v )
 {
    SECONDARYCOLORF(UINT_TO_FLOAT(v[0]),
                    UINT_TO_FLOAT(v[1]),
@@ -1028,7 +1028,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3usvEXT_f( const GLushort *v )
+_mesa_SecondaryColor3usv( const GLushort *v )
 {
    SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]),
                    USHORT_TO_FLOAT(v[1]),
@@ -1036,7 +1036,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v )
 }
 
 void GLAPIENTRY
-loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
+_mesa_SecondaryColor3ubv( const GLubyte *v )
 {
    SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]),
                    UBYTE_TO_FLOAT(v[1]),
@@ -1051,111 +1051,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
  */
 
 void GLAPIENTRY
-loopback_VertexAttrib1sNV(GLuint index, GLshort x)
+_mesa_VertexAttrib1sNV(GLuint index, GLshort x)
 {
    ATTRIB1NV(index, (GLfloat) x);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1dNV(GLuint index, GLdouble x)
+_mesa_VertexAttrib1dNV(GLuint index, GLdouble x)
 {
    ATTRIB1NV(index, (GLfloat) x);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
+_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
 {
    ATTRIB2NV(index, (GLfloat) x, y);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
+_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
 {
    ATTRIB2NV(index, (GLfloat) x, (GLfloat) y);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
+_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
 	UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v)
 {
    ATTRIB1NV(index, (GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
 {
    ATTRIB1NV(index, (GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v)
 {
    ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
 {
    ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v)
 {
    ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
 {
    ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v)
 {
    ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 
 	  (GLfloat)v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
 {
    ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
+_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
 {
    ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
           UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
@@ -1163,15 +1163,15 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
 
 
 void GLAPIENTRY
-loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib1svNV(index + i, v + i);
+      _mesa_VertexAttrib1svNV(index + i, v + i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
@@ -1179,23 +1179,23 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib1dvNV(index + i, v + i);
+      _mesa_VertexAttrib1dvNV(index + i, v + i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib2svNV(index + i, v + 2 * i);
+      _mesa_VertexAttrib2svNV(index + i, v + 2 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
@@ -1203,23 +1203,23 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib2dvNV(index + i, v + 2 * i);
+      _mesa_VertexAttrib2dvNV(index + i, v + 2 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib3svNV(index + i, v + 3 * i);
+      _mesa_VertexAttrib3svNV(index + i, v + 3 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
@@ -1227,23 +1227,23 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib3dvNV(index + i, v + 3 * i);
+      _mesa_VertexAttrib3dvNV(index + i, v + 3 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4svNV(index + i, v + 4 * i);
+      _mesa_VertexAttrib4svNV(index + i, v + 4 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
@@ -1251,19 +1251,19 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4dvNV(index + i, v + 4 * i);
+      _mesa_VertexAttrib4dvNV(index + i, v + 4 * i);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
+_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
 {
    GLint i;
    for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);
+      _mesa_VertexAttrib4ubvNV(index + i, v + 4 * i);
 }
 
 
@@ -1274,176 +1274,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
  */
 
 void GLAPIENTRY
-loopback_VertexAttrib1sARB(GLuint index, GLshort x)
+_mesa_VertexAttrib1s(GLuint index, GLshort x)
 {
    ATTRIB1ARB(index, (GLfloat) x);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1dARB(GLuint index, GLdouble x)
+_mesa_VertexAttrib1d(GLuint index, GLdouble x)
 {
    ATTRIB1ARB(index, (GLfloat) x);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y)
+_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
    ATTRIB2ARB(index, (GLfloat) x, y);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y)
+_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
    ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z)
+_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib1sv(GLuint index, const GLshort *v)
 {
    ATTRIB1ARB(index, (GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v)
 {
    ATTRIB1ARB(index, (GLfloat) v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib2sv(GLuint index, const GLshort *v)
 {
    ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v)
 {
    ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib3sv(GLuint index, const GLshort *v)
 {
    ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v)
 {
    ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib4sv(GLuint index, const GLshort *v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 
 	  (GLfloat)v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v)
+_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4ivARB(GLuint index, const GLint * v)
+_mesa_VertexAttrib4iv(GLuint index, const GLint * v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v)
+_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v)
+_mesa_VertexAttrib4usv(GLuint index, const GLushort * v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v)
+_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v)
 {
    ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v)
+_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v)
 {
    ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
           BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v)
+_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v)
 {
    ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
           SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NivARB(GLuint index, const GLint * v)
+_mesa_VertexAttrib4Niv(GLuint index, const GLint * v)
 {
    ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
           INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
               UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v)
+_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v)
 {
    ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
           UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v)
+_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v)
 {
    ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
           USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]));
 }
 
 void GLAPIENTRY
-loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
+_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v)
 {
    ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
           UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]));
@@ -1457,37 +1457,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
  */
 
 void GLAPIENTRY
-loopback_VertexAttribI1iv(GLuint index, const GLint *v)
+_mesa_VertexAttribI1iv(GLuint index, const GLint *v)
 {
    ATTRIBI_1I(index, v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribI1uiv(GLuint index, const GLuint *v)
+_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v)
 {
    ATTRIBI_1UI(index, v[0]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribI4bv(GLuint index, const GLbyte *v)
+_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v)
 {
    ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribI4sv(GLuint index, const GLshort *v)
+_mesa_VertexAttribI4sv(GLuint index, const GLshort *v)
 {
    ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v)
+_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
    ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
 }
 
 void GLAPIENTRY
-loopback_VertexAttribI4usv(GLuint index, const GLushort *v)
+_mesa_VertexAttribI4usv(GLuint index, const GLushort *v)
 {
    ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
 }
@@ -1504,226 +1504,226 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
                               struct _glapi_table *dest)
 {
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
-      SET_Color4ub(dest, loopback_Color4ub_f);
-      SET_Materialf(dest, loopback_Materialf);
+      SET_Color4ub(dest, _mesa_Color4ub);
+      SET_Materialf(dest, _mesa_Materialf);
    }
    if (ctx->API == API_OPENGL) {
-      SET_Color3b(dest, loopback_Color3b_f);
-      SET_Color3d(dest, loopback_Color3d_f);
-      SET_Color3i(dest, loopback_Color3i_f);
-      SET_Color3s(dest, loopback_Color3s_f);
-      SET_Color3ui(dest, loopback_Color3ui_f);
-      SET_Color3us(dest, loopback_Color3us_f);
-      SET_Color3ub(dest, loopback_Color3ub_f);
-      SET_Color4b(dest, loopback_Color4b_f);
-      SET_Color4d(dest, loopback_Color4d_f);
-      SET_Color4i(dest, loopback_Color4i_f);
-      SET_Color4s(dest, loopback_Color4s_f);
-      SET_Color4ui(dest, loopback_Color4ui_f);
-      SET_Color4us(dest, loopback_Color4us_f);
-      SET_Color3bv(dest, loopback_Color3bv_f);
-      SET_Color3dv(dest, loopback_Color3dv_f);
-      SET_Color3iv(dest, loopback_Color3iv_f);
-      SET_Color3sv(dest, loopback_Color3sv_f);
-      SET_Color3uiv(dest, loopback_Color3uiv_f);
-      SET_Color3usv(dest, loopback_Color3usv_f);
-      SET_Color3ubv(dest, loopback_Color3ubv_f);
-      SET_Color4bv(dest, loopback_Color4bv_f);
-      SET_Color4dv(dest, loopback_Color4dv_f);
-      SET_Color4iv(dest, loopback_Color4iv_f);
-      SET_Color4sv(dest, loopback_Color4sv_f);
-      SET_Color4uiv(dest, loopback_Color4uiv_f);
-      SET_Color4usv(dest, loopback_Color4usv_f);
-      SET_Color4ubv(dest, loopback_Color4ubv_f);
-
-      SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f);
-      SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f);
-      SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f);
-      SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f);
-      SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f);
-      SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f);
-      SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f);
-      SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f);
-      SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f);
-      SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f);
-      SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f);
-      SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f);
-      SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f);
-      SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f);
+      SET_Color3b(dest, _mesa_Color3b);
+      SET_Color3d(dest, _mesa_Color3d);
+      SET_Color3i(dest, _mesa_Color3i);
+      SET_Color3s(dest, _mesa_Color3s);
+      SET_Color3ui(dest, _mesa_Color3ui);
+      SET_Color3us(dest, _mesa_Color3us);
+      SET_Color3ub(dest, _mesa_Color3ub);
+      SET_Color4b(dest, _mesa_Color4b);
+      SET_Color4d(dest, _mesa_Color4d);
+      SET_Color4i(dest, _mesa_Color4i);
+      SET_Color4s(dest, _mesa_Color4s);
+      SET_Color4ui(dest, _mesa_Color4ui);
+      SET_Color4us(dest, _mesa_Color4us);
+      SET_Color3bv(dest, _mesa_Color3bv);
+      SET_Color3dv(dest, _mesa_Color3dv);
+      SET_Color3iv(dest, _mesa_Color3iv);
+      SET_Color3sv(dest, _mesa_Color3sv);
+      SET_Color3uiv(dest, _mesa_Color3uiv);
+      SET_Color3usv(dest, _mesa_Color3usv);
+      SET_Color3ubv(dest, _mesa_Color3ubv);
+      SET_Color4bv(dest, _mesa_Color4bv);
+      SET_Color4dv(dest, _mesa_Color4dv);
+      SET_Color4iv(dest, _mesa_Color4iv);
+      SET_Color4sv(dest, _mesa_Color4sv);
+      SET_Color4uiv(dest, _mesa_Color4uiv);
+      SET_Color4usv(dest, _mesa_Color4usv);
+      SET_Color4ubv(dest, _mesa_Color4ubv);
+
+      SET_SecondaryColor3b(dest, _mesa_SecondaryColor3b);
+      SET_SecondaryColor3d(dest, _mesa_SecondaryColor3d);
+      SET_SecondaryColor3i(dest, _mesa_SecondaryColor3i);
+      SET_SecondaryColor3s(dest, _mesa_SecondaryColor3s);
+      SET_SecondaryColor3ui(dest, _mesa_SecondaryColor3ui);
+      SET_SecondaryColor3us(dest, _mesa_SecondaryColor3us);
+      SET_SecondaryColor3ub(dest, _mesa_SecondaryColor3ub);
+      SET_SecondaryColor3bv(dest, _mesa_SecondaryColor3bv);
+      SET_SecondaryColor3dv(dest, _mesa_SecondaryColor3dv);
+      SET_SecondaryColor3iv(dest, _mesa_SecondaryColor3iv);
+      SET_SecondaryColor3sv(dest, _mesa_SecondaryColor3sv);
+      SET_SecondaryColor3uiv(dest, _mesa_SecondaryColor3uiv);
+      SET_SecondaryColor3usv(dest, _mesa_SecondaryColor3usv);
+      SET_SecondaryColor3ubv(dest, _mesa_SecondaryColor3ubv);
       
-      SET_EdgeFlagv(dest, loopback_EdgeFlagv);
-
-      SET_Indexd(dest, loopback_Indexd);
-      SET_Indexi(dest, loopback_Indexi);
-      SET_Indexs(dest, loopback_Indexs);
-      SET_Indexub(dest, loopback_Indexub);
-      SET_Indexdv(dest, loopback_Indexdv);
-      SET_Indexiv(dest, loopback_Indexiv);
-      SET_Indexsv(dest, loopback_Indexsv);
-      SET_Indexubv(dest, loopback_Indexubv);
-      SET_Normal3b(dest, loopback_Normal3b);
-      SET_Normal3d(dest, loopback_Normal3d);
-      SET_Normal3i(dest, loopback_Normal3i);
-      SET_Normal3s(dest, loopback_Normal3s);
-      SET_Normal3bv(dest, loopback_Normal3bv);
-      SET_Normal3dv(dest, loopback_Normal3dv);
-      SET_Normal3iv(dest, loopback_Normal3iv);
-      SET_Normal3sv(dest, loopback_Normal3sv);
-      SET_TexCoord1d(dest, loopback_TexCoord1d);
-      SET_TexCoord1i(dest, loopback_TexCoord1i);
-      SET_TexCoord1s(dest, loopback_TexCoord1s);
-      SET_TexCoord2d(dest, loopback_TexCoord2d);
-      SET_TexCoord2s(dest, loopback_TexCoord2s);
-      SET_TexCoord2i(dest, loopback_TexCoord2i);
-      SET_TexCoord3d(dest, loopback_TexCoord3d);
-      SET_TexCoord3i(dest, loopback_TexCoord3i);
-      SET_TexCoord3s(dest, loopback_TexCoord3s);
-      SET_TexCoord4d(dest, loopback_TexCoord4d);
-      SET_TexCoord4i(dest, loopback_TexCoord4i);
-      SET_TexCoord4s(dest, loopback_TexCoord4s);
-      SET_TexCoord1dv(dest, loopback_TexCoord1dv);
-      SET_TexCoord1iv(dest, loopback_TexCoord1iv);
-      SET_TexCoord1sv(dest, loopback_TexCoord1sv);
-      SET_TexCoord2dv(dest, loopback_TexCoord2dv);
-      SET_TexCoord2iv(dest, loopback_TexCoord2iv);
-      SET_TexCoord2sv(dest, loopback_TexCoord2sv);
-      SET_TexCoord3dv(dest, loopback_TexCoord3dv);
-      SET_TexCoord3iv(dest, loopback_TexCoord3iv);
-      SET_TexCoord3sv(dest, loopback_TexCoord3sv);
-      SET_TexCoord4dv(dest, loopback_TexCoord4dv);
-      SET_TexCoord4iv(dest, loopback_TexCoord4iv);
-      SET_TexCoord4sv(dest, loopback_TexCoord4sv);
-      SET_Vertex2d(dest, loopback_Vertex2d);
-      SET_Vertex2i(dest, loopback_Vertex2i);
-      SET_Vertex2s(dest, loopback_Vertex2s);
-      SET_Vertex3d(dest, loopback_Vertex3d);
-      SET_Vertex3i(dest, loopback_Vertex3i);
-      SET_Vertex3s(dest, loopback_Vertex3s);
-      SET_Vertex4d(dest, loopback_Vertex4d);
-      SET_Vertex4i(dest, loopback_Vertex4i);
-      SET_Vertex4s(dest, loopback_Vertex4s);
-      SET_Vertex2dv(dest, loopback_Vertex2dv);
-      SET_Vertex2iv(dest, loopback_Vertex2iv);
-      SET_Vertex2sv(dest, loopback_Vertex2sv);
-      SET_Vertex3dv(dest, loopback_Vertex3dv);
-      SET_Vertex3iv(dest, loopback_Vertex3iv);
-      SET_Vertex3sv(dest, loopback_Vertex3sv);
-      SET_Vertex4dv(dest, loopback_Vertex4dv);
-      SET_Vertex4iv(dest, loopback_Vertex4iv);
-      SET_Vertex4sv(dest, loopback_Vertex4sv);
-      SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB);
-      SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB);
-      SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB);
-      SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB);
-      SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB);
-      SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB);
-      SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB);
-      SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB);
-      SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB);
-      SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB);
-      SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB);
-      SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB);
-      SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB);
-      SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB);
-      SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB);
-      SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB);
-      SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB);
-      SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB);
-      SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB);
-      SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB);
-      SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB);
-      SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB);
-      SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB);
-      SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB);
-      SET_EvalCoord2dv(dest, loopback_EvalCoord2dv);
-      SET_EvalCoord2fv(dest, loopback_EvalCoord2fv);
-      SET_EvalCoord2d(dest, loopback_EvalCoord2d);
-      SET_EvalCoord1dv(dest, loopback_EvalCoord1dv);
-      SET_EvalCoord1fv(dest, loopback_EvalCoord1fv);
-      SET_EvalCoord1d(dest, loopback_EvalCoord1d);
-      SET_Materiali(dest, loopback_Materiali);
-      SET_Materialiv(dest, loopback_Materialiv);
-      SET_Rectd(dest, loopback_Rectd);
-      SET_Rectdv(dest, loopback_Rectdv);
-      SET_Rectfv(dest, loopback_Rectfv);
-      SET_Recti(dest, loopback_Recti);
-      SET_Rectiv(dest, loopback_Rectiv);
-      SET_Rects(dest, loopback_Rects);
-      SET_Rectsv(dest, loopback_Rectsv);
-      SET_FogCoorddEXT(dest, loopback_FogCoorddEXT);
-      SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT);
+      SET_EdgeFlagv(dest, _mesa_EdgeFlagv);
+
+      SET_Indexd(dest, _mesa_Indexd);
+      SET_Indexi(dest, _mesa_Indexi);
+      SET_Indexs(dest, _mesa_Indexs);
+      SET_Indexub(dest, _mesa_Indexub);
+      SET_Indexdv(dest, _mesa_Indexdv);
+      SET_Indexiv(dest, _mesa_Indexiv);
+      SET_Indexsv(dest, _mesa_Indexsv);
+      SET_Indexubv(dest, _mesa_Indexubv);
+      SET_Normal3b(dest, _mesa_Normal3b);
+      SET_Normal3d(dest, _mesa_Normal3d);
+      SET_Normal3i(dest, _mesa_Normal3i);
+      SET_Normal3s(dest, _mesa_Normal3s);
+      SET_Normal3bv(dest, _mesa_Normal3bv);
+      SET_Normal3dv(dest, _mesa_Normal3dv);
+      SET_Normal3iv(dest, _mesa_Normal3iv);
+      SET_Normal3sv(dest, _mesa_Normal3sv);
+      SET_TexCoord1d(dest, _mesa_TexCoord1d);
+      SET_TexCoord1i(dest, _mesa_TexCoord1i);
+      SET_TexCoord1s(dest, _mesa_TexCoord1s);
+      SET_TexCoord2d(dest, _mesa_TexCoord2d);
+      SET_TexCoord2s(dest, _mesa_TexCoord2s);
+      SET_TexCoord2i(dest, _mesa_TexCoord2i);
+      SET_TexCoord3d(dest, _mesa_TexCoord3d);
+      SET_TexCoord3i(dest, _mesa_TexCoord3i);
+      SET_TexCoord3s(dest, _mesa_TexCoord3s);
+      SET_TexCoord4d(dest, _mesa_TexCoord4d);
+      SET_TexCoord4i(dest, _mesa_TexCoord4i);
+      SET_TexCoord4s(dest, _mesa_TexCoord4s);
+      SET_TexCoord1dv(dest, _mesa_TexCoord1dv);
+      SET_TexCoord1iv(dest, _mesa_TexCoord1iv);
+      SET_TexCoord1sv(dest, _mesa_TexCoord1sv);
+      SET_TexCoord2dv(dest, _mesa_TexCoord2dv);
+      SET_TexCoord2iv(dest, _mesa_TexCoord2iv);
+      SET_TexCoord2sv(dest, _mesa_TexCoord2sv);
+      SET_TexCoord3dv(dest, _mesa_TexCoord3dv);
+      SET_TexCoord3iv(dest, _mesa_TexCoord3iv);
+      SET_TexCoord3sv(dest, _mesa_TexCoord3sv);
+      SET_TexCoord4dv(dest, _mesa_TexCoord4dv);
+      SET_TexCoord4iv(dest, _mesa_TexCoord4iv);
+      SET_TexCoord4sv(dest, _mesa_TexCoord4sv);
+      SET_Vertex2d(dest, _mesa_Vertex2d);
+      SET_Vertex2i(dest, _mesa_Vertex2i);
+      SET_Vertex2s(dest, _mesa_Vertex2s);
+      SET_Vertex3d(dest, _mesa_Vertex3d);
+      SET_Vertex3i(dest, _mesa_Vertex3i);
+      SET_Vertex3s(dest, _mesa_Vertex3s);
+      SET_Vertex4d(dest, _mesa_Vertex4d);
+      SET_Vertex4i(dest, _mesa_Vertex4i);
+      SET_Vertex4s(dest, _mesa_Vertex4s);
+      SET_Vertex2dv(dest, _mesa_Vertex2dv);
+      SET_Vertex2iv(dest, _mesa_Vertex2iv);
+      SET_Vertex2sv(dest, _mesa_Vertex2sv);
+      SET_Vertex3dv(dest, _mesa_Vertex3dv);
+      SET_Vertex3iv(dest, _mesa_Vertex3iv);
+      SET_Vertex3sv(dest, _mesa_Vertex3sv);
+      SET_Vertex4dv(dest, _mesa_Vertex4dv);
+      SET_Vertex4iv(dest, _mesa_Vertex4iv);
+      SET_Vertex4sv(dest, _mesa_Vertex4sv);
+      SET_MultiTexCoord1d(dest, _mesa_MultiTexCoord1d);
+      SET_MultiTexCoord1dv(dest, _mesa_MultiTexCoord1dv);
+      SET_MultiTexCoord1i(dest, _mesa_MultiTexCoord1i);
+      SET_MultiTexCoord1iv(dest, _mesa_MultiTexCoord1iv);
+      SET_MultiTexCoord1s(dest, _mesa_MultiTexCoord1s);
+      SET_MultiTexCoord1sv(dest, _mesa_MultiTexCoord1sv);
+      SET_MultiTexCoord2d(dest, _mesa_MultiTexCoord2d);
+      SET_MultiTexCoord2dv(dest, _mesa_MultiTexCoord2dv);
+      SET_MultiTexCoord2i(dest, _mesa_MultiTexCoord2i);
+      SET_MultiTexCoord2iv(dest, _mesa_MultiTexCoord2iv);
+      SET_MultiTexCoord2s(dest, _mesa_MultiTexCoord2s);
+      SET_MultiTexCoord2sv(dest, _mesa_MultiTexCoord2sv);
+      SET_MultiTexCoord3d(dest, _mesa_MultiTexCoord3d);
+      SET_MultiTexCoord3dv(dest, _mesa_MultiTexCoord3dv);
+      SET_MultiTexCoord3i(dest, _mesa_MultiTexCoord3i);
+      SET_MultiTexCoord3iv(dest, _mesa_MultiTexCoord3iv);
+      SET_MultiTexCoord3s(dest, _mesa_MultiTexCoord3s);
+      SET_MultiTexCoord3sv(dest, _mesa_MultiTexCoord3sv);
+      SET_MultiTexCoord4d(dest, _mesa_MultiTexCoord4d);
+      SET_MultiTexCoord4dv(dest, _mesa_MultiTexCoord4dv);
+      SET_MultiTexCoord4i(dest, _mesa_MultiTexCoord4i);
+      SET_MultiTexCoord4iv(dest, _mesa_MultiTexCoord4iv);
+      SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s);
+      SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv);
+      SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv);
+      SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv);
+      SET_EvalCoord2d(dest, _mesa_EvalCoord2d);
+      SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv);
+      SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv);
+      SET_EvalCoord1d(dest, _mesa_EvalCoord1d);
+      SET_Materiali(dest, _mesa_Materiali);
+      SET_Materialiv(dest, _mesa_Materialiv);
+      SET_Rectd(dest, _mesa_Rectd);
+      SET_Rectdv(dest, _mesa_Rectdv);
+      SET_Rectfv(dest, _mesa_Rectfv);
+      SET_Recti(dest, _mesa_Recti);
+      SET_Rectiv(dest, _mesa_Rectiv);
+      SET_Rects(dest, _mesa_Rects);
+      SET_Rectsv(dest, _mesa_Rectsv);
+      SET_FogCoordd(dest, _mesa_FogCoordd);
+      SET_FogCoorddv(dest, _mesa_FogCoorddv);
    }
 
    if (ctx->API == API_OPENGL) {
-      SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV);
-      SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV);
-      SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV);
-      SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV);
-      SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV);
-      SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV);
-      SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV);
-      SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV);
-      SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV);
-      SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV);
-      SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV);
-      SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV);
-      SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV);
-      SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV);
-      SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV);
-      SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV);
-      SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV);
-      SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV);
-      SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV);
-      SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV);
-      SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV);
-      SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV);
-      SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV);
-      SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV);
-      SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV);
-      SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV);
-      SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV);
-      SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV);
-      SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV);
-      SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV);
-      SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);
+      SET_VertexAttrib1sNV(dest, _mesa_VertexAttrib1sNV);
+      SET_VertexAttrib1dNV(dest, _mesa_VertexAttrib1dNV);
+      SET_VertexAttrib2sNV(dest, _mesa_VertexAttrib2sNV);
+      SET_VertexAttrib2dNV(dest, _mesa_VertexAttrib2dNV);
+      SET_VertexAttrib3sNV(dest, _mesa_VertexAttrib3sNV);
+      SET_VertexAttrib3dNV(dest, _mesa_VertexAttrib3dNV);
+      SET_VertexAttrib4sNV(dest, _mesa_VertexAttrib4sNV);
+      SET_VertexAttrib4dNV(dest, _mesa_VertexAttrib4dNV);
+      SET_VertexAttrib4ubNV(dest, _mesa_VertexAttrib4ubNV);
+      SET_VertexAttrib1svNV(dest, _mesa_VertexAttrib1svNV);
+      SET_VertexAttrib1dvNV(dest, _mesa_VertexAttrib1dvNV);
+      SET_VertexAttrib2svNV(dest, _mesa_VertexAttrib2svNV);
+      SET_VertexAttrib2dvNV(dest, _mesa_VertexAttrib2dvNV);
+      SET_VertexAttrib3svNV(dest, _mesa_VertexAttrib3svNV);
+      SET_VertexAttrib3dvNV(dest, _mesa_VertexAttrib3dvNV);
+      SET_VertexAttrib4svNV(dest, _mesa_VertexAttrib4svNV);
+      SET_VertexAttrib4dvNV(dest, _mesa_VertexAttrib4dvNV);
+      SET_VertexAttrib4ubvNV(dest, _mesa_VertexAttrib4ubvNV);
+      SET_VertexAttribs1svNV(dest, _mesa_VertexAttribs1svNV);
+      SET_VertexAttribs1fvNV(dest, _mesa_VertexAttribs1fvNV);
+      SET_VertexAttribs1dvNV(dest, _mesa_VertexAttribs1dvNV);
+      SET_VertexAttribs2svNV(dest, _mesa_VertexAttribs2svNV);
+      SET_VertexAttribs2fvNV(dest, _mesa_VertexAttribs2fvNV);
+      SET_VertexAttribs2dvNV(dest, _mesa_VertexAttribs2dvNV);
+      SET_VertexAttribs3svNV(dest, _mesa_VertexAttribs3svNV);
+      SET_VertexAttribs3fvNV(dest, _mesa_VertexAttribs3fvNV);
+      SET_VertexAttribs3dvNV(dest, _mesa_VertexAttribs3dvNV);
+      SET_VertexAttribs4svNV(dest, _mesa_VertexAttribs4svNV);
+      SET_VertexAttribs4fvNV(dest, _mesa_VertexAttribs4fvNV);
+      SET_VertexAttribs4dvNV(dest, _mesa_VertexAttribs4dvNV);
+      SET_VertexAttribs4ubvNV(dest, _mesa_VertexAttribs4ubvNV);
    }
 
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB);
-      SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB);
-      SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB);
-      SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB);
-      SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB);
-      SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB);
-      SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB);
-      SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB);
-      SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB);
-      SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB);
-      SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB);
-      SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB);
-      SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB);
-      SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB);
-      SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB);
-      SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB);
-      SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB);
-      SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB);
-      SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB);
-      SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB);
-      SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB);
-      SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB);
-      SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB);
-      SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB);
-      SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB);
-      SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);
-      SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB);
-      SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);
+      SET_VertexAttrib1s(dest, _mesa_VertexAttrib1s);
+      SET_VertexAttrib1d(dest, _mesa_VertexAttrib1d);
+      SET_VertexAttrib2s(dest, _mesa_VertexAttrib2s);
+      SET_VertexAttrib2d(dest, _mesa_VertexAttrib2d);
+      SET_VertexAttrib3s(dest, _mesa_VertexAttrib3s);
+      SET_VertexAttrib3d(dest, _mesa_VertexAttrib3d);
+      SET_VertexAttrib4s(dest, _mesa_VertexAttrib4s);
+      SET_VertexAttrib4d(dest, _mesa_VertexAttrib4d);
+      SET_VertexAttrib1sv(dest, _mesa_VertexAttrib1sv);
+      SET_VertexAttrib1dv(dest, _mesa_VertexAttrib1dv);
+      SET_VertexAttrib2sv(dest, _mesa_VertexAttrib2sv);
+      SET_VertexAttrib2dv(dest, _mesa_VertexAttrib2dv);
+      SET_VertexAttrib3sv(dest, _mesa_VertexAttrib3sv);
+      SET_VertexAttrib3dv(dest, _mesa_VertexAttrib3dv);
+      SET_VertexAttrib4sv(dest, _mesa_VertexAttrib4sv);
+      SET_VertexAttrib4dv(dest, _mesa_VertexAttrib4dv);
+      SET_VertexAttrib4Nub(dest, _mesa_VertexAttrib4Nub);
+      SET_VertexAttrib4Nubv(dest, _mesa_VertexAttrib4Nubv);
+      SET_VertexAttrib4bv(dest, _mesa_VertexAttrib4bv);
+      SET_VertexAttrib4iv(dest, _mesa_VertexAttrib4iv);
+      SET_VertexAttrib4ubv(dest, _mesa_VertexAttrib4ubv);
+      SET_VertexAttrib4usv(dest, _mesa_VertexAttrib4usv);
+      SET_VertexAttrib4uiv(dest, _mesa_VertexAttrib4uiv);
+      SET_VertexAttrib4Nbv(dest, _mesa_VertexAttrib4Nbv);
+      SET_VertexAttrib4Nsv(dest, _mesa_VertexAttrib4Nsv);
+      SET_VertexAttrib4Nusv(dest, _mesa_VertexAttrib4Nusv);
+      SET_VertexAttrib4Niv(dest, _mesa_VertexAttrib4Niv);
+      SET_VertexAttrib4Nuiv(dest, _mesa_VertexAttrib4Nuiv);
 
       /* GL_EXT_gpu_shader4, GL 3.0 */
-      SET_VertexAttribI1ivEXT(dest, loopback_VertexAttribI1iv);
-      SET_VertexAttribI1uivEXT(dest, loopback_VertexAttribI1uiv);
-      SET_VertexAttribI4bvEXT(dest, loopback_VertexAttribI4bv);
-      SET_VertexAttribI4svEXT(dest, loopback_VertexAttribI4sv);
-      SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv);
-      SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv);
+      SET_VertexAttribI1iv(dest, _mesa_VertexAttribI1iv);
+      SET_VertexAttribI1uiv(dest, _mesa_VertexAttribI1uiv);
+      SET_VertexAttribI4bv(dest, _mesa_VertexAttribI4bv);
+      SET_VertexAttribI4sv(dest, _mesa_VertexAttribI4sv);
+      SET_VertexAttribI4ubv(dest, _mesa_VertexAttribI4ubv);
+      SET_VertexAttribI4usv(dest, _mesa_VertexAttribI4usv);
    }
 }
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 879ad89956c..c35d57bffe9 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -45,433 +45,433 @@ extern void
 _mesa_loopback_init_api_table(const struct gl_context *ctx,
                               struct _glapi_table *dest);
 void GLAPIENTRY
-loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue );
+_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue );
 void GLAPIENTRY
-loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue );
+_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue );
 void GLAPIENTRY
-loopback_Color3i_f( GLint red, GLint green, GLint blue );
+_mesa_Color3i( GLint red, GLint green, GLint blue );
 void GLAPIENTRY
-loopback_Color3s_f( GLshort red, GLshort green, GLshort blue );
+_mesa_Color3s( GLshort red, GLshort green, GLshort blue );
 void GLAPIENTRY
-loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue );
+_mesa_Color3ui( GLuint red, GLuint green, GLuint blue );
 void GLAPIENTRY
-loopback_Color3us_f( GLushort red, GLushort green, GLushort blue );
+_mesa_Color3us( GLushort red, GLushort green, GLushort blue );
 void GLAPIENTRY
-loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue );
+_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue );
 void GLAPIENTRY
-loopback_Color3bv_f( const GLbyte *v );
+_mesa_Color3bv( const GLbyte *v );
 void GLAPIENTRY
-loopback_Color3dv_f( const GLdouble *v );
+_mesa_Color3dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Color3iv_f( const GLint *v );
+_mesa_Color3iv( const GLint *v );
 void GLAPIENTRY
-loopback_Color3sv_f( const GLshort *v );
+_mesa_Color3sv( const GLshort *v );
 void GLAPIENTRY
-loopback_Color3uiv_f( const GLuint *v );
+_mesa_Color3uiv( const GLuint *v );
 void GLAPIENTRY
-loopback_Color3usv_f( const GLushort *v );
+_mesa_Color3usv( const GLushort *v );
 void GLAPIENTRY
-loopback_Color3ubv_f( const GLubyte *v );
+_mesa_Color3ubv( const GLubyte *v );
 void GLAPIENTRY
-loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
+_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue,
                     GLbyte alpha );
 void GLAPIENTRY
-loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
+_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue,
                     GLdouble alpha );
 void GLAPIENTRY
-loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha );
+_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha );
 void GLAPIENTRY
-loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
+_mesa_Color4s( GLshort red, GLshort green, GLshort blue,
                     GLshort alpha );
 void GLAPIENTRY
-loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha );
+_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha );
 void GLAPIENTRY
-loopback_Color4us_f( GLushort red, GLushort green, GLushort blue,
+_mesa_Color4us( GLushort red, GLushort green, GLushort blue,
                      GLushort alpha );
 void GLAPIENTRY
-loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
+_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
 void GLAPIENTRY
-loopback_Color4iv_f( const GLint *v );
+_mesa_Color4iv( const GLint *v );
 void GLAPIENTRY
-loopback_Color4bv_f( const GLbyte *v );
+_mesa_Color4bv( const GLbyte *v );
 void GLAPIENTRY
-loopback_Color4dv_f( const GLdouble *v );
+_mesa_Color4dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Color4sv_f( const GLshort *v);
+_mesa_Color4sv( const GLshort *v);
 void GLAPIENTRY
-loopback_Color4uiv_f( const GLuint *v);
+_mesa_Color4uiv( const GLuint *v);
 void GLAPIENTRY
-loopback_Color4usv_f( const GLushort *v);
+_mesa_Color4usv( const GLushort *v);
 void GLAPIENTRY
-loopback_Color4ubv_f( const GLubyte *v);
+_mesa_Color4ubv( const GLubyte *v);
 void GLAPIENTRY
-loopback_FogCoorddEXT( GLdouble d );
+_mesa_FogCoordd( GLdouble d );
 void GLAPIENTRY
-loopback_FogCoorddvEXT( const GLdouble *v );
+_mesa_FogCoorddv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Indexd( GLdouble c );
+_mesa_Indexd( GLdouble c );
 void GLAPIENTRY
-loopback_Indexi( GLint c );
+_mesa_Indexi( GLint c );
 void GLAPIENTRY
-loopback_Indexs( GLshort c );
+_mesa_Indexs( GLshort c );
 void GLAPIENTRY
-loopback_Indexub( GLubyte c );
+_mesa_Indexub( GLubyte c );
 void GLAPIENTRY
-loopback_Indexdv( const GLdouble *c );
+_mesa_Indexdv( const GLdouble *c );
 void GLAPIENTRY
-loopback_Indexiv( const GLint *c );
+_mesa_Indexiv( const GLint *c );
 void GLAPIENTRY
-loopback_Indexsv( const GLshort *c );
+_mesa_Indexsv( const GLshort *c );
 void GLAPIENTRY
-loopback_Indexubv( const GLubyte *c );
+_mesa_Indexubv( const GLubyte *c );
 void GLAPIENTRY
-loopback_EdgeFlagv(const GLboolean *flag);
+_mesa_EdgeFlagv(const GLboolean *flag);
 void GLAPIENTRY
-loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
 void GLAPIENTRY
-loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
 void GLAPIENTRY
-loopback_Normal3i( GLint nx, GLint ny, GLint nz );
+_mesa_Normal3i( GLint nx, GLint ny, GLint nz );
 void GLAPIENTRY
-loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz );
+_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz );
 void GLAPIENTRY
-loopback_Normal3bv( const GLbyte *v );
+_mesa_Normal3bv( const GLbyte *v );
 void GLAPIENTRY
-loopback_Normal3dv( const GLdouble *v );
+_mesa_Normal3dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Normal3iv( const GLint *v );
+_mesa_Normal3iv( const GLint *v );
 void GLAPIENTRY
-loopback_Normal3sv( const GLshort *v );
+_mesa_Normal3sv( const GLshort *v );
 void GLAPIENTRY
-loopback_TexCoord1d( GLdouble s );
+_mesa_TexCoord1d( GLdouble s );
 void GLAPIENTRY
-loopback_TexCoord1i( GLint s );
+_mesa_TexCoord1i( GLint s );
 void GLAPIENTRY
-loopback_TexCoord1s( GLshort s );
+_mesa_TexCoord1s( GLshort s );
 void GLAPIENTRY
-loopback_TexCoord2d( GLdouble s, GLdouble t );
+_mesa_TexCoord2d( GLdouble s, GLdouble t );
 void GLAPIENTRY
-loopback_TexCoord2s( GLshort s, GLshort t );
+_mesa_TexCoord2s( GLshort s, GLshort t );
 void GLAPIENTRY
-loopback_TexCoord2i( GLint s, GLint t );
+_mesa_TexCoord2i( GLint s, GLint t );
 void GLAPIENTRY
-loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
 void GLAPIENTRY
-loopback_TexCoord3i( GLint s, GLint t, GLint r );
+_mesa_TexCoord3i( GLint s, GLint t, GLint r );
 void GLAPIENTRY
-loopback_TexCoord3s( GLshort s, GLshort t, GLshort r );
+_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r );
 void GLAPIENTRY
-loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
 void GLAPIENTRY
-loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
+_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
 void GLAPIENTRY
-loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
 void GLAPIENTRY
-loopback_TexCoord1dv( const GLdouble *v );
+_mesa_TexCoord1dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_TexCoord1iv( const GLint *v );
+_mesa_TexCoord1iv( const GLint *v );
 void GLAPIENTRY
-loopback_TexCoord1sv( const GLshort *v );
+_mesa_TexCoord1sv( const GLshort *v );
 void GLAPIENTRY
-loopback_TexCoord2dv( const GLdouble *v );
+_mesa_TexCoord2dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_TexCoord2iv( const GLint *v );
+_mesa_TexCoord2iv( const GLint *v );
 void GLAPIENTRY
-loopback_TexCoord2sv( const GLshort *v );
+_mesa_TexCoord2sv( const GLshort *v );
 void GLAPIENTRY
-loopback_TexCoord3dv( const GLdouble *v );
+_mesa_TexCoord3dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_TexCoord3iv( const GLint *v );
+_mesa_TexCoord3iv( const GLint *v );
 void GLAPIENTRY
-loopback_TexCoord3sv( const GLshort *v );
+_mesa_TexCoord3sv( const GLshort *v );
 void GLAPIENTRY
-loopback_TexCoord4dv( const GLdouble *v );
+_mesa_TexCoord4dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_TexCoord4iv( const GLint *v );
+_mesa_TexCoord4iv( const GLint *v );
 void GLAPIENTRY
-loopback_TexCoord4sv( const GLshort *v );
+_mesa_TexCoord4sv( const GLshort *v );
 void GLAPIENTRY
-loopback_Vertex2d( GLdouble x, GLdouble y );
+_mesa_Vertex2d( GLdouble x, GLdouble y );
 void GLAPIENTRY
-loopback_Vertex2i( GLint x, GLint y );
+_mesa_Vertex2i( GLint x, GLint y );
 void GLAPIENTRY
-loopback_Vertex2s( GLshort x, GLshort y );
+_mesa_Vertex2s( GLshort x, GLshort y );
 void GLAPIENTRY
-loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
+_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
 void GLAPIENTRY
-loopback_Vertex3i( GLint x, GLint y, GLint z );
+_mesa_Vertex3i( GLint x, GLint y, GLint z );
 void GLAPIENTRY
-loopback_Vertex3s( GLshort x, GLshort y, GLshort z );
+_mesa_Vertex3s( GLshort x, GLshort y, GLshort z );
 void GLAPIENTRY
-loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
 void GLAPIENTRY
-loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w );
+_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w );
 void GLAPIENTRY
-loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
 void GLAPIENTRY
-loopback_Vertex2dv( const GLdouble *v );
+_mesa_Vertex2dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Vertex2iv( const GLint *v );
+_mesa_Vertex2iv( const GLint *v );
 void GLAPIENTRY
-loopback_Vertex2sv( const GLshort *v );
+_mesa_Vertex2sv( const GLshort *v );
 void GLAPIENTRY
-loopback_Vertex3dv( const GLdouble *v );
+_mesa_Vertex3dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Vertex3iv( const GLint *v );
+_mesa_Vertex3iv( const GLint *v );
 void GLAPIENTRY
-loopback_Vertex3sv( const GLshort *v );
+_mesa_Vertex3sv( const GLshort *v );
 void GLAPIENTRY
-loopback_Vertex4dv( const GLdouble *v );
+_mesa_Vertex4dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_Vertex4iv( const GLint *v );
+_mesa_Vertex4iv( const GLint *v );
 void GLAPIENTRY
-loopback_Vertex4sv( const GLshort *v );
+_mesa_Vertex4sv( const GLshort *v );
 void GLAPIENTRY
-loopback_MultiTexCoord1dARB(GLenum target, GLdouble s);
+_mesa_MultiTexCoord1d(GLenum target, GLdouble s);
 void GLAPIENTRY
-loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v);
 void GLAPIENTRY
-loopback_MultiTexCoord1iARB(GLenum target, GLint s);
+_mesa_MultiTexCoord1i(GLenum target, GLint s);
 void GLAPIENTRY
-loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord1iv(GLenum target, const GLint *v);
 void GLAPIENTRY
-loopback_MultiTexCoord1sARB(GLenum target, GLshort s);
+_mesa_MultiTexCoord1s(GLenum target, GLshort s);
 void GLAPIENTRY
-loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v);
 void GLAPIENTRY
-loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t);
 void GLAPIENTRY
-loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v);
 void GLAPIENTRY
-loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t);
 void GLAPIENTRY
-loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord2iv(GLenum target, const GLint *v);
 void GLAPIENTRY
-loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t);
 void GLAPIENTRY
-loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v);
 void GLAPIENTRY
-loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r);
 void GLAPIENTRY
-loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v);
 void GLAPIENTRY
-loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r);
 void GLAPIENTRY
-loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord3iv(GLenum target, const GLint *v);
 void GLAPIENTRY
-loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r);
 void GLAPIENTRY
-loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v);
 void GLAPIENTRY
-loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r,
+_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r,
                             GLdouble q);
 void GLAPIENTRY
-loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v);
 void GLAPIENTRY
-loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q);
 void GLAPIENTRY
-loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord4iv(GLenum target, const GLint *v);
 void GLAPIENTRY
-loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r,
+_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r,
                             GLshort q);
 void GLAPIENTRY
-loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v);
 void GLAPIENTRY
-loopback_EvalCoord2dv( const GLdouble *u );
+_mesa_EvalCoord2dv( const GLdouble *u );
 void GLAPIENTRY
-loopback_EvalCoord2fv( const GLfloat *u );
+_mesa_EvalCoord2fv( const GLfloat *u );
 void GLAPIENTRY
-loopback_EvalCoord2d( GLdouble u, GLdouble v );
+_mesa_EvalCoord2d( GLdouble u, GLdouble v );
 void GLAPIENTRY
-loopback_EvalCoord1dv( const GLdouble *u );
+_mesa_EvalCoord1dv( const GLdouble *u );
 void GLAPIENTRY
-loopback_EvalCoord1fv( const GLfloat *u );
+_mesa_EvalCoord1fv( const GLfloat *u );
 void GLAPIENTRY
-loopback_EvalCoord1d( GLdouble u );
+_mesa_EvalCoord1d( GLdouble u );
 void GLAPIENTRY
-loopback_Materialf( GLenum face, GLenum pname, GLfloat param );
+_mesa_Materialf( GLenum face, GLenum pname, GLfloat param );
 void GLAPIENTRY
-loopback_Materiali(GLenum face, GLenum pname, GLint param );
+_mesa_Materiali(GLenum face, GLenum pname, GLint param );
 void GLAPIENTRY
-loopback_Materialiv(GLenum face, GLenum pname, const GLint *params );
+_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params );
 void GLAPIENTRY
-loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
 void GLAPIENTRY
-loopback_Rectdv(const GLdouble *v1, const GLdouble *v2);
+_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2);
 void GLAPIENTRY
-loopback_Rectfv(const GLfloat *v1, const GLfloat *v2);
+_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2);
 void GLAPIENTRY
-loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
+_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
 void GLAPIENTRY
-loopback_Rectiv(const GLint *v1, const GLint *v2);
+_mesa_Rectiv(const GLint *v1, const GLint *v2);
 void GLAPIENTRY
-loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
 void GLAPIENTRY
-loopback_Rectsv(const GLshort *v1, const GLshort *v2);
+_mesa_Rectsv(const GLshort *v1, const GLshort *v2);
 void GLAPIENTRY
-loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue );
+_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue );
 void GLAPIENTRY
-loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue );
+_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue );
 void GLAPIENTRY
-loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue );
+_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue );
 void GLAPIENTRY
-loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue );
+_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue );
 void GLAPIENTRY
-loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue );
+_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue );
 void GLAPIENTRY
-loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue );
+_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue );
 void GLAPIENTRY
-loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue );
+_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue );
 void GLAPIENTRY
-loopback_SecondaryColor3bvEXT_f( const GLbyte *v );
+_mesa_SecondaryColor3bv( const GLbyte *v );
 void GLAPIENTRY
-loopback_SecondaryColor3dvEXT_f( const GLdouble *v );
+_mesa_SecondaryColor3dv( const GLdouble *v );
 void GLAPIENTRY
-loopback_SecondaryColor3ivEXT_f( const GLint *v );
+_mesa_SecondaryColor3iv( const GLint *v );
 void GLAPIENTRY
-loopback_SecondaryColor3svEXT_f( const GLshort *v );
+_mesa_SecondaryColor3sv( const GLshort *v );
 void GLAPIENTRY
-loopback_SecondaryColor3uivEXT_f( const GLuint *v );
+_mesa_SecondaryColor3uiv( const GLuint *v );
 void GLAPIENTRY
-loopback_SecondaryColor3usvEXT_f( const GLushort *v );
+_mesa_SecondaryColor3usv( const GLushort *v );
 void GLAPIENTRY
-loopback_SecondaryColor3ubvEXT_f( const GLubyte *v );
+_mesa_SecondaryColor3ubv( const GLubyte *v );
 void GLAPIENTRY
-loopback_VertexAttrib1sNV(GLuint index, GLshort x);
+_mesa_VertexAttrib1sNV(GLuint index, GLshort x);
 void GLAPIENTRY
-loopback_VertexAttrib1dNV(GLuint index, GLdouble x);
+_mesa_VertexAttrib1dNV(GLuint index, GLdouble x);
 void GLAPIENTRY
-loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
+_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
 void GLAPIENTRY
-loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
+_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
 void GLAPIENTRY
-loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
+_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
 void GLAPIENTRY
-loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
+_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
 void GLAPIENTRY
-loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
+_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
                           GLshort w);
 void GLAPIENTRY
-loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
+_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
                           GLdouble w);
 void GLAPIENTRY
-loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
+_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
                            GLubyte w);
 void GLAPIENTRY
-loopback_VertexAttrib1svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib2svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib3svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib4svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
+_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
 void GLAPIENTRY
-loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
 void GLAPIENTRY
-loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
 void GLAPIENTRY
-loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
 void GLAPIENTRY
-loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
 void GLAPIENTRY
-loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
+_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
 void GLAPIENTRY
-loopback_VertexAttrib1sARB(GLuint index, GLshort x);
+_mesa_VertexAttrib1s(GLuint index, GLshort x);
 void GLAPIENTRY
-loopback_VertexAttrib1dARB(GLuint index, GLdouble x);
+_mesa_VertexAttrib1d(GLuint index, GLdouble x);
 void GLAPIENTRY
-loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y);
+_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y);
 void GLAPIENTRY
-loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y);
+_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y);
 void GLAPIENTRY
-loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z);
+_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z);
 void GLAPIENTRY
-loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z);
+_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z);
 void GLAPIENTRY
-loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z,
+_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z,
                            GLshort w);
 void GLAPIENTRY
-loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z,
+_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z,
                            GLdouble w);
 void GLAPIENTRY
-loopback_VertexAttrib1svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib1sv(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib2svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib2sv(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib3svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib3sv(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib4svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib4sv(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v);
 void GLAPIENTRY
-loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v);
+_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v);
 void GLAPIENTRY
-loopback_VertexAttrib4ivARB(GLuint index, const GLint * v);
+_mesa_VertexAttrib4iv(GLuint index, const GLint * v);
 void GLAPIENTRY
-loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v);
+_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v);
 void GLAPIENTRY
-loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v);
+_mesa_VertexAttrib4usv(GLuint index, const GLushort * v);
 void GLAPIENTRY
-loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v);
+_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v);
+_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v);
+_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NivARB(GLuint index, const GLint * v);
+_mesa_VertexAttrib4Niv(GLuint index, const GLint * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z,
+_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z,
                              GLubyte w);
 void GLAPIENTRY
-loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v);
+_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v);
+_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v);
 void GLAPIENTRY
-loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v);
+_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v);
 void GLAPIENTRY
-loopback_VertexAttribI1iv(GLuint index, const GLint *v);
+_mesa_VertexAttribI1iv(GLuint index, const GLint *v);
 void GLAPIENTRY
-loopback_VertexAttribI1uiv(GLuint index, const GLuint *v);
+_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v);
 void GLAPIENTRY
-loopback_VertexAttribI4bv(GLuint index, const GLbyte *v);
+_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v);
 void GLAPIENTRY
-loopback_VertexAttribI4sv(GLuint index, const GLshort *v);
+_mesa_VertexAttribI4sv(GLuint index, const GLshort *v);
 void GLAPIENTRY
-loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v);
+_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v);
 void GLAPIENTRY
-loopback_VertexAttribI4usv(GLuint index, const GLushort *v);
+_mesa_VertexAttribI4usv(GLuint index, const GLushort *v);
 
 
 #endif /* API_LOOPBACK_H */
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 9be86c2febc..8150b5f4ec1 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -46,7 +46,7 @@
  * and glBindProgramARB.
  */
 void GLAPIENTRY
-_mesa_BindProgram(GLenum target, GLuint id)
+_mesa_BindProgramARB(GLenum target, GLuint id)
 {
    struct gl_program *curProg, *newProg;
    GET_CURRENT_CONTEXT(ctx);
@@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
  * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
  */
 void GLAPIENTRY 
-_mesa_DeletePrograms(GLsizei n, const GLuint *ids)
+_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids)
 {
    GLint i;
    GET_CURRENT_CONTEXT(ctx);
@@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
                if (ctx->VertexProgram.Current &&
                    ctx->VertexProgram.Current->Base.Id == ids[i]) {
                   /* unbind this currently bound program */
-                  _mesa_BindProgram(prog->Target, 0);
+                  _mesa_BindProgramARB(prog->Target, 0);
                }
                break;
             case GL_FRAGMENT_PROGRAM_ARB:
                if (ctx->FragmentProgram.Current &&
                    ctx->FragmentProgram.Current->Base.Id == ids[i]) {
                   /* unbind this currently bound program */
-                  _mesa_BindProgram(prog->Target, 0);
+                  _mesa_BindProgramARB(prog->Target, 0);
                }
                break;
             default:
@@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
  * \note Called by both glGenProgramsNV and glGenProgramsARB.
  */
 void GLAPIENTRY
-_mesa_GenPrograms(GLsizei n, GLuint *ids)
+_mesa_GenProgramsARB(GLsizei n, GLuint *ids)
 {
    GLuint first;
    GLuint i;
diff --git a/src/mesa/main/arbprogram.h b/src/mesa/main/arbprogram.h
index e2e535e911e..4f40a70c591 100644
--- a/src/mesa/main/arbprogram.h
+++ b/src/mesa/main/arbprogram.h
@@ -31,13 +31,13 @@
 
 
 extern void GLAPIENTRY
-_mesa_BindProgram(GLenum target, GLuint id);
+_mesa_BindProgramARB(GLenum target, GLuint id);
 
 extern void GLAPIENTRY
-_mesa_DeletePrograms(GLsizei n, const GLuint *ids);
+_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids);
 
 extern void GLAPIENTRY
-_mesa_GenPrograms(GLsizei n, GLuint *ids);
+_mesa_GenProgramsARB(GLsizei n, GLuint *ids);
 
 
 extern GLboolean GLAPIENTRY
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 926c753dd38..a909e0effaa 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -431,7 +431,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
  * \param ids    Array of \c n array object IDs.
  */
 void GLAPIENTRY
-_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
+_mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLsizei i;
@@ -541,7 +541,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
  *          \c GL_FALSE otherwise.
  */
 GLboolean GLAPIENTRY
-_mesa_IsVertexArrayAPPLE( GLuint id )
+_mesa_IsVertexArray( GLuint id )
 {
    struct gl_array_object * obj;
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index dfefec2a7a3..0d58bb75ac2 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -110,12 +110,12 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
 
 void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
 
-void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
+void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
 
 void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
 
 void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
 
-GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
+GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
 
 #endif /* ARRAYOBJ_H */
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 0997e5407fa..acb33885ab0 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -618,7 +618,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
       const GLbitfield genEnabled = enable->TexGen[i];
 
       if (ctx->Texture.Unit[i].Enabled != enabled) {
-         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+         _mesa_ActiveTexture(GL_TEXTURE0 + i);
 
          _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(enabled & TEXTURE_1D_BIT));
          _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(enabled & TEXTURE_2D_BIT));
@@ -640,7 +640,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
       }
 
       if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
-         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+         _mesa_ActiveTexture(GL_TEXTURE0 + i);
          _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, !!(genEnabled & S_BIT));
          _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, !!(genEnabled & T_BIT));
          _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, !!(genEnabled & R_BIT));
@@ -648,7 +648,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
       }
    }
 
-   _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
+   _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
 }
 
 
@@ -666,7 +666,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
       const struct gl_texture_unit *unit = &texstate->Texture.Unit[u];
       GLuint tgt;
 
-      _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
+      _mesa_ActiveTexture(GL_TEXTURE0_ARB + u);
       _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(unit->Enabled & TEXTURE_1D_BIT));
       _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT));
       _mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT));
@@ -808,7 +808,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
       }
    }
 
-   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
+   _mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
 
    _mesa_reference_shared_state(ctx, &texstate->SharedRef, NULL);
 
@@ -879,7 +879,7 @@ _mesa_PopAttrib(void)
                else {
                   GLuint i;
                   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-                     _mesa_ColorMaskIndexed(i, 
+                     _mesa_ColorMaski(i, 
                                   (GLboolean) (color->ColorMask[i][0] != 0),
                                   (GLboolean) (color->ColorMask[i][1] != 0),
                                   (GLboolean) (color->ColorMask[i][2] != 0),
@@ -910,7 +910,7 @@ _mesa_PopAttrib(void)
                    * to record that error.  Per OpenGL ARB decision.
                    */
                   if (multipleBuffers)
-                     _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers,
+                     _mesa_DrawBuffers(ctx->Const.MaxDrawBuffers,
                                           color->DrawBuffer);
                   else
                      _mesa_DrawBuffer(color->DrawBuffer[0]);
@@ -934,18 +934,18 @@ _mesa_PopAttrib(void)
                   /* set blend per buffer */
                   GLuint buf;
                   for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
-                     _mesa_BlendFuncSeparatei(buf, color->Blend[buf].SrcRGB,
+                     _mesa_BlendFuncSeparateiARB(buf, color->Blend[buf].SrcRGB,
                                               color->Blend[buf].DstRGB,
                                               color->Blend[buf].SrcA,
                                               color->Blend[buf].DstA);
-                     _mesa_BlendEquationSeparatei(buf,
+                     _mesa_BlendEquationSeparateiARB(buf,
                                                   color->Blend[buf].EquationRGB,
                                                   color->Blend[buf].EquationA);
                   }
                }
                else {
                   /* set same blend modes for all buffers */
-                  _mesa_BlendFuncSeparateEXT(color->Blend[0].SrcRGB,
+                  _mesa_BlendFuncSeparate(color->Blend[0].SrcRGB,
                                              color->Blend[0].DstRGB,
                                              color->Blend[0].SrcA,
                                              color->Blend[0].DstA);
@@ -957,7 +957,7 @@ _mesa_PopAttrib(void)
                      _mesa_BlendEquation(color->Blend[0].EquationRGB);
                   }
                   else {
-                     _mesa_BlendEquationSeparateEXT(
+                     _mesa_BlendEquationSeparate(
                                                  color->Blend[0].EquationRGB,
                                                  color->Blend[0].EquationA);
                   }
@@ -972,8 +972,8 @@ _mesa_PopAttrib(void)
                _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
                                 color->IndexLogicOpEnabled);
                _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
-               _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
-               _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
+               _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
+               _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
 
                /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
                if (ctx->Extensions.EXT_framebuffer_sRGB)
@@ -1100,7 +1100,7 @@ _mesa_PopAttrib(void)
                /* materials */
                memcpy(&ctx->Light.Material, &light->Material,
                       sizeof(struct gl_material));
-               _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
+               _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
             }
             break;
          case GL_LINE_BIT:
@@ -1293,7 +1293,7 @@ _mesa_PopAttrib(void)
 			       ms->SampleAlphaToOne,
 			       GL_SAMPLE_ALPHA_TO_ONE);
 
-               _mesa_SampleCoverageARB(ms->SampleCoverageValue,
+               _mesa_SampleCoverage(ms->SampleCoverageValue,
                                        ms->SampleCoverageInvert);
             }
             break;
@@ -1432,7 +1432,7 @@ restore_array_attrib(struct gl_context *ctx,
    const bool arb_vao = (src->ArrayObj->Name != 0
 			 && src->ArrayObj->ARBsemantics);
 
-   if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name))
+   if (arb_vao && !_mesa_IsVertexArray(src->ArrayObj->Name))
       return;
 
    _mesa_BindVertexArrayAPPLE(src->ArrayObj->Name);
@@ -1440,11 +1440,11 @@ restore_array_attrib(struct gl_context *ctx,
    /* Restore or recreate the buffer objects by the names ... */
    if (!arb_vao
        || src->ArrayBufferObj->Name == 0
-       || _mesa_IsBufferARB(src->ArrayBufferObj->Name)) {
+       || _mesa_IsBuffer(src->ArrayBufferObj->Name)) {
       /* ... and restore its content */
       copy_array_attrib(ctx, dest, src, false);
 
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
+      _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB,
 			  src->ArrayBufferObj->Name);
    } else {
       copy_array_attrib(ctx, dest, src, true);
@@ -1452,8 +1452,8 @@ restore_array_attrib(struct gl_context *ctx,
 
    if (!arb_vao
        || src->ArrayObj->ElementArrayBufferObj->Name == 0
-       || _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name))
-      _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB,
+       || _mesa_IsBuffer(src->ArrayObj->ElementArrayBufferObj->Name))
+      _mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,
 			  src->ArrayObj->ElementArrayBufferObj->Name);
 }
 
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 5cd3ce24425..1930b1c37ce 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -170,7 +170,7 @@ validate_blend_factors(struct gl_context *ctx, const char *func,
 void GLAPIENTRY
 _mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
 {
-   _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);
+   _mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor);
 }
 
 static GLboolean
@@ -201,7 +201,7 @@ update_uses_dual_src(struct gl_context *ctx, int buf)
  * \param dfactorA alpha destination factor operator.
  */
 void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
                             GLenum sfactorA, GLenum dfactorA )
 {
    GLuint buf, numBuffers;
@@ -260,9 +260,9 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
  * Set blend source/dest factors for one color buffer/target.
  */
 void GLAPIENTRY
-_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
+_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor)
 {
-   _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor);
+   _mesa_BlendFuncSeparateiARB(buf, sfactor, dfactor, sfactor, dfactor);
 }
 
 
@@ -270,7 +270,7 @@ _mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
  * Set separate blend source/dest factors for one color buffer/target.
  */
 void GLAPIENTRY
-_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
                          GLenum sfactorA, GLenum dfactorA)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -384,7 +384,7 @@ _mesa_BlendEquation( GLenum mode )
  * Set blend equation for one color buffer/target.
  */
 void GLAPIENTRY
-_mesa_BlendEquationi(GLuint buf, GLenum mode)
+_mesa_BlendEquationiARB(GLuint buf, GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -419,7 +419,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode)
 
 
 void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
+_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA )
 {
    GLuint buf, numBuffers;
    GLboolean changed;
@@ -477,7 +477,7 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
  * Set separate blend equations for one color buffer/target.
  */
 void GLAPIENTRY
-_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)
+_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -730,7 +730,7 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
  * For GL_EXT_draw_buffers2 and GL3
  */
 void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
+_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
                         GLboolean blue, GLboolean alpha )
 {
    GLubyte tmp[4];
@@ -766,7 +766,7 @@ _mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
 
 
 void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp)
+_mesa_ClampColor(GLenum target, GLenum clamp)
 {
    GET_CURRENT_CONTEXT(ctx);
 
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index d74f17ef160..a539aa80937 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
 
 
 extern void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
                             GLenum sfactorA, GLenum dfactorA );
 
 
 extern void GLAPIENTRY
-_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor);
+_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
 
 
 extern void GLAPIENTRY
-_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
                          GLenum sfactorA, GLenum dfactorA);
 
 
@@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode );
 
 
 extern void GLAPIENTRY
-_mesa_BlendEquationi(GLuint buf, GLenum mode);
+_mesa_BlendEquationiARB(GLuint buf, GLenum mode);
 
 
 extern void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA );
+_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA );
 
 
 extern void GLAPIENTRY
-_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA);
+_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA);
 
 
 extern void GLAPIENTRY
@@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
                  GLboolean blue, GLboolean alpha );
 
 extern void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
+_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
                         GLboolean blue, GLboolean alpha );
 
 
 extern void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp);
+_mesa_ClampColor(GLenum target, GLenum clamp);
 
 
 extern void  
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 43eb8876ea6..5521617f1af 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -819,7 +819,7 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver)
 /**********************************************************************/
 
 void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer)
+_mesa_BindBuffer(GLenum target, GLuint buffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -839,7 +839,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
  * \param ids    Array of \c n buffer object IDs.
  */
 void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
+_mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLsizei i;
@@ -874,23 +874,23 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          }
 
          if (ctx->Array.ArrayBufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
+            _mesa_BindBuffer( GL_ARRAY_BUFFER_ARB, 0 );
          }
          if (arrayObj->ElementArrayBufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
+            _mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
          }
 
          /* unbind ARB_copy_buffer binding points */
          if (ctx->CopyReadBuffer == bufObj) {
-            _mesa_BindBufferARB( GL_COPY_READ_BUFFER, 0 );
+            _mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 );
          }
          if (ctx->CopyWriteBuffer == bufObj) {
-            _mesa_BindBufferARB( GL_COPY_WRITE_BUFFER, 0 );
+            _mesa_BindBuffer( GL_COPY_WRITE_BUFFER, 0 );
          }
 
          /* unbind transform feedback binding points */
          if (ctx->TransformFeedback.CurrentBuffer == bufObj) {
-            _mesa_BindBufferARB( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
+            _mesa_BindBuffer( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
          }
          for (j = 0; j < MAX_FEEDBACK_BUFFERS; j++) {
             if (ctx->TransformFeedback.CurrentObject->Buffers[j] == bufObj) {
@@ -906,19 +906,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          }
 
          if (ctx->UniformBuffer == bufObj) {
-            _mesa_BindBufferARB( GL_UNIFORM_BUFFER, 0 );
+            _mesa_BindBuffer( GL_UNIFORM_BUFFER, 0 );
          }
 
          /* unbind any pixel pack/unpack pointers bound to this buffer */
          if (ctx->Pack.BufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
+            _mesa_BindBuffer( GL_PIXEL_PACK_BUFFER_EXT, 0 );
          }
          if (ctx->Unpack.BufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
+            _mesa_BindBuffer( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
          }
 
          if (ctx->Texture.BufferObject == bufObj) {
-            _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 );
+            _mesa_BindBuffer( GL_TEXTURE_BUFFER, 0 );
          }
 
          /* The ID is immediately freed for re-use */
@@ -949,7 +949,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
  * \param buffer  Array of \c n locations to store the IDs.
  */
 void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
+_mesa_GenBuffers(GLsizei n, GLuint *buffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint first;
@@ -994,7 +994,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
  *          \c GL_FALSE otherwise.
  */
 GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint id)
+_mesa_IsBuffer(GLuint id)
 {
    struct gl_buffer_object *bufObj;
    GET_CURRENT_CONTEXT(ctx);
@@ -1009,7 +1009,7 @@ _mesa_IsBufferARB(GLuint id)
 
 
 void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
+_mesa_BufferData(GLenum target, GLsizeiptrARB size,
                     const GLvoid * data, GLenum usage)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1089,7 +1089,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
 
 void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
+_mesa_BufferSubData(GLenum target, GLintptrARB offset,
                        GLsizeiptrARB size, const GLvoid * data)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1114,7 +1114,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
 
 
 void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
+_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
                           GLsizeiptrARB size, void * data)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1134,7 +1134,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
 
 
 void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access)
+_mesa_MapBuffer(GLenum target, GLenum access)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object * bufObj;
@@ -1229,7 +1229,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
 
 
 GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target)
+_mesa_UnmapBuffer(GLenum target)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
@@ -1292,7 +1292,7 @@ _mesa_UnmapBufferARB(GLenum target)
 
 
 void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
+_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
@@ -1395,7 +1395,7 @@ invalid_pname:
 
 
 void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
+_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object * bufObj;
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 4d5446ac082..e98e47670c6 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -101,29 +101,29 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver);
  */
 
 void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer);
+_mesa_BindBuffer(GLenum target, GLuint buffer);
 void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
+_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
 void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
+_mesa_GenBuffers(GLsizei n, GLuint * buffer);
 GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint buffer);
+_mesa_IsBuffer(GLuint buffer);
 void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
+_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
 void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
+_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
 void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
+_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
 void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access);
+_mesa_MapBuffer(GLenum target, GLenum access);
 GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target);
+_mesa_UnmapBuffer(GLenum target);
 void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
+_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
 void GLAPIENTRY
 _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
 void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
+_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
 void GLAPIENTRY
 _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
                         GLintptr readOffset, GLintptr writeOffset,
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index cc268b67cbc..fd430aad0cc 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -206,7 +206,7 @@ read_buffer_enum_to_index(GLenum buffer)
  * Called by glDrawBuffer().
  * Specify which renderbuffer(s) to draw into for the first color output.
  * <buffer> can name zero, one, two or four renderbuffers!
- * \sa _mesa_DrawBuffersARB
+ * \sa _mesa_DrawBuffers
  *
  * \param buffer  buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc.
  *
@@ -280,7 +280,7 @@ _mesa_DrawBuffer(GLenum buffer)
  *                 GL_FRONT_AND_BACK is illegal.
  */
 void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
+_mesa_DrawBuffers(GLsizei n, const GLenum *buffers)
 {
    GLint output;
    GLbitfield usedBufferMask, supportedMask;
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 8083bc3d353..e9768f9446d 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -41,7 +41,7 @@ extern void GLAPIENTRY
 _mesa_DrawBuffer( GLenum mode );
 
 extern void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
+_mesa_DrawBuffers(GLsizei n, const GLenum *buffers);
 
 extern void
 _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 8bbead7c4a2..6b99f35bb5f 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1152,7 +1152,7 @@ save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA)
       n[2].e = modeA;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA));
+      CALL_BlendEquationSeparate(ctx->Exec, (modeRGB, modeA));
    }
 }
 
@@ -1172,7 +1172,7 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
       n[4].e = dfactorA;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BlendFuncSeparateEXT(ctx->Exec,
+      CALL_BlendFuncSeparate(ctx->Exec,
                                 (sfactorRGB, dfactorRGB, sfactorA, dfactorA));
    }
 }
@@ -1703,7 +1703,7 @@ save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green,
       n[5].b = alpha;
    }
    if (ctx->ExecuteFlag) {
-      /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/
+      /*CALL_ColorMaski(ctx->Exec, (buf, red, green, blue, alpha));*/
    }
 }
 
@@ -2276,7 +2276,7 @@ save_DisableIndexed(GLuint index, GLenum cap)
       n[2].e = cap;
    }
    if (ctx->ExecuteFlag) {
-      CALL_DisableIndexedEXT(ctx->Exec, (index, cap));
+      CALL_Disablei(ctx->Exec, (index, cap));
    }
 }
 
@@ -2351,7 +2351,7 @@ save_EnableIndexed(GLuint index, GLenum cap)
       n[2].e = cap;
    }
    if (ctx->ExecuteFlag) {
-      CALL_EnableIndexedEXT(ctx->Exec, (index, cap));
+      CALL_Enablei(ctx->Exec, (index, cap));
    }
 }
 
@@ -3254,7 +3254,7 @@ save_PointParameterfvEXT(GLenum pname, const GLfloat *params)
       n[4].f = params[2];
    }
    if (ctx->ExecuteFlag) {
-      CALL_PointParameterfvEXT(ctx->Exec, (pname, params));
+      CALL_PointParameterfv(ctx->Exec, (pname, params));
    }
 }
 
@@ -4538,7 +4538,7 @@ save_ActiveTextureARB(GLenum target)
       n[1].e = target;
    }
    if (ctx->ExecuteFlag) {
-      CALL_ActiveTextureARB(ctx->Exec, (target));
+      CALL_ActiveTexture(ctx->Exec, (target));
    }
 }
 
@@ -4609,7 +4609,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_1D) {
       /* don't compile, execute immediately */
-      CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat,
+      CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat,
                                                width, border, imageSize,
                                                data));
    }
@@ -4628,7 +4628,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          n[7].data = copy_data(data, imageSize, "glCompressedTexImage1DARB");
       }
       if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage1DARB(ctx->Exec,
+         CALL_CompressedTexImage1D(ctx->Exec,
                                       (target, level, internalFormat, width,
                                        border, imageSize, data));
       }
@@ -4645,7 +4645,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_2D) {
       /* don't compile, execute immediately */
-      CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat,
+      CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat,
                                                width, height, border,
                                                imageSize, data));
    }
@@ -4665,7 +4665,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          n[8].data = copy_data(data, imageSize, "glCompressedTexImage2DARB");
       }
       if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage2DARB(ctx->Exec,
+         CALL_CompressedTexImage2D(ctx->Exec,
                                       (target, level, internalFormat, width,
                                        height, border, imageSize, data));
       }
@@ -4682,7 +4682,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_3D) {
       /* don't compile, execute immediately */
-      CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat,
+      CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat,
                                                width, height, depth, border,
                                                imageSize, data));
    }
@@ -4703,7 +4703,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          n[9].data = copy_data(data, imageSize, "glCompressedTexImage3DARB");
       }
       if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage3DARB(ctx->Exec,
+         CALL_CompressedTexImage3D(ctx->Exec,
                                       (target, level, internalFormat, width,
                                        height, depth, border, imageSize,
                                        data));
@@ -4732,7 +4732,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       n[7].data = copy_data(data, imageSize, "glCompressedTexSubImage1DARB");
    }
    if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset,
+      CALL_CompressedTexSubImage1D(ctx->Exec, (target, level, xoffset,
                                                   width, format, imageSize,
                                                   data));
    }
@@ -4762,7 +4762,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       n[9].data = copy_data(data, imageSize, "glCompressedTexSubImage2DARB");
    }
    if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage2DARB(ctx->Exec,
+      CALL_CompressedTexSubImage2D(ctx->Exec,
                                       (target, level, xoffset, yoffset, width,
                                        height, format, imageSize, data));
    }
@@ -4794,7 +4794,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       n[11].data = copy_data(data, imageSize, "glCompressedTexSubImage3DARB");
    }
    if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage3DARB(ctx->Exec,
+      CALL_CompressedTexSubImage3D(ctx->Exec,
                                       (target, level, xoffset, yoffset,
                                        zoffset, width, height, depth, format,
                                        imageSize, data));
@@ -4815,7 +4815,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert)
       n[2].b = invert;
    }
    if (ctx->ExecuteFlag) {
-      CALL_SampleCoverageARB(ctx->Exec, (value, invert));
+      CALL_SampleCoverage(ctx->Exec, (value, invert));
    }
 }
 
@@ -4835,7 +4835,7 @@ save_BindProgramNV(GLenum target, GLuint id)
       n[2].ui = id;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BindProgramNV(ctx->Exec, (target, id));
+      CALL_BindProgramARB(ctx->Exec, (target, id));
    }
 }
 
@@ -5120,7 +5120,7 @@ save_BeginQueryARB(GLenum target, GLuint id)
       n[2].ui = id;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BeginQueryARB(ctx->Exec, (target, id));
+      CALL_BeginQuery(ctx->Exec, (target, id));
    }
 }
 
@@ -5135,7 +5135,7 @@ save_EndQueryARB(GLenum target)
       n[1].e = target;
    }
    if (ctx->ExecuteFlag) {
-      CALL_EndQueryARB(ctx->Exec, (target));
+      CALL_EndQuery(ctx->Exec, (target));
    }
 }
 
@@ -5206,7 +5206,7 @@ save_DrawBuffersARB(GLsizei count, const GLenum * buffers)
       }
    }
    if (ctx->ExecuteFlag) {
-      CALL_DrawBuffersARB(ctx->Exec, (count, buffers));
+      CALL_DrawBuffers(ctx->Exec, (count, buffers));
    }
 }
 
@@ -6022,7 +6022,7 @@ exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_BindAttribLocationARB(ctx->Exec, (program, index, name));
+   CALL_BindAttribLocation(ctx->Exec, (program, index, name));
 }
 
 static GLint GLAPIENTRY
@@ -6030,7 +6030,7 @@ exec_GetAttribLocationARB(GLuint program, const GLchar *name)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   return CALL_GetAttribLocationARB(ctx->Exec, (program, name));
+   return CALL_GetAttribLocation(ctx->Exec, (program, name));
 }
 
 static GLint GLAPIENTRY
@@ -6038,7 +6038,7 @@ exec_GetUniformLocationARB(GLuint program, const GLchar *name)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   return CALL_GetUniformLocationARB(ctx->Exec, (program, name));
+   return CALL_GetUniformLocation(ctx->Exec, (program, name));
 }
 /* XXX more shader functions needed here */
 
@@ -6065,7 +6065,7 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
       n[10].e = filter;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,
+      CALL_BlitFramebuffer(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,
                                           dstX0, dstY0, dstX1, dstY1,
                                           mask, filter));
    }
@@ -6084,8 +6084,8 @@ save_ProvokingVertexEXT(GLenum mode)
       n[1].e = mode;
    }
    if (ctx->ExecuteFlag) {
-      /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/
-      _mesa_ProvokingVertexEXT(mode);
+      /*CALL_ProvokingVertex(ctx->Exec, (mode));*/
+      _mesa_ProvokingVertex(mode);
    }
 }
 
@@ -6102,7 +6102,7 @@ save_BeginTransformFeedback(GLenum mode)
       n[1].e = mode;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode));
+      CALL_BeginTransformFeedback(ctx->Exec, (mode));
    }
 }
 
@@ -6115,7 +6115,7 @@ save_EndTransformFeedback(void)
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0);
    if (ctx->ExecuteFlag) {
-      CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+      CALL_EndTransformFeedback(ctx->Exec, ());
    }
 }
 
@@ -6240,7 +6240,7 @@ save_UseProgramObjectARB(GLhandleARB program)
       n[1].ui = program;
    }
    if (ctx->ExecuteFlag) {
-      CALL_UseProgramObjectARB(ctx->Exec, (program));
+      CALL_UseProgram(ctx->Exec, (program));
    }
 }
 
@@ -6257,7 +6257,7 @@ save_Uniform1fARB(GLint location, GLfloat x)
       n[2].f = x;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform1fARB(ctx->Exec, (location, x));
+      CALL_Uniform1f(ctx->Exec, (location, x));
    }
 }
 
@@ -6275,7 +6275,7 @@ save_Uniform2fARB(GLint location, GLfloat x, GLfloat y)
       n[3].f = y;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform2fARB(ctx->Exec, (location, x, y));
+      CALL_Uniform2f(ctx->Exec, (location, x, y));
    }
 }
 
@@ -6294,7 +6294,7 @@ save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z)
       n[4].f = z;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform3fARB(ctx->Exec, (location, x, y, z));
+      CALL_Uniform3f(ctx->Exec, (location, x, y, z));
    }
 }
 
@@ -6314,7 +6314,7 @@ save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
       n[5].f = w;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w));
+      CALL_Uniform4f(ctx->Exec, (location, x, y, z, w));
    }
 }
 
@@ -6343,7 +6343,7 @@ save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v)
       n[3].data = memdup(v, count * 1 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform1fvARB(ctx->Exec, (location, count, v));
+      CALL_Uniform1fv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6360,7 +6360,7 @@ save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v)
       n[3].data = memdup(v, count * 2 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform2fvARB(ctx->Exec, (location, count, v));
+      CALL_Uniform2fv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6377,7 +6377,7 @@ save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v)
       n[3].data = memdup(v, count * 3 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform3fvARB(ctx->Exec, (location, count, v));
+      CALL_Uniform3fv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6394,7 +6394,7 @@ save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v)
       n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform4fvARB(ctx->Exec, (location, count, v));
+      CALL_Uniform4fv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6411,7 +6411,7 @@ save_Uniform1iARB(GLint location, GLint x)
       n[2].i = x;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform1iARB(ctx->Exec, (location, x));
+      CALL_Uniform1i(ctx->Exec, (location, x));
    }
 }
 
@@ -6428,7 +6428,7 @@ save_Uniform2iARB(GLint location, GLint x, GLint y)
       n[3].i = y;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform2iARB(ctx->Exec, (location, x, y));
+      CALL_Uniform2i(ctx->Exec, (location, x, y));
    }
 }
 
@@ -6446,7 +6446,7 @@ save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z)
       n[4].i = z;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform3iARB(ctx->Exec, (location, x, y, z));
+      CALL_Uniform3i(ctx->Exec, (location, x, y, z));
    }
 }
 
@@ -6465,7 +6465,7 @@ save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w)
       n[5].i = w;
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w));
+      CALL_Uniform4i(ctx->Exec, (location, x, y, z, w));
    }
 }
 
@@ -6484,7 +6484,7 @@ save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v)
       n[3].data = memdup(v, count * 1 * sizeof(GLint));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform1ivARB(ctx->Exec, (location, count, v));
+      CALL_Uniform1iv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6501,7 +6501,7 @@ save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v)
       n[3].data = memdup(v, count * 2 * sizeof(GLint));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform2ivARB(ctx->Exec, (location, count, v));
+      CALL_Uniform2iv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6518,7 +6518,7 @@ save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v)
       n[3].data = memdup(v, count * 3 * sizeof(GLint));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform3ivARB(ctx->Exec, (location, count, v));
+      CALL_Uniform3iv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6535,7 +6535,7 @@ save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v)
       n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_Uniform4ivARB(ctx->Exec, (location, count, v));
+      CALL_Uniform4iv(ctx->Exec, (location, count, v));
    }
 }
 
@@ -6698,7 +6698,7 @@ save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
       n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m));
+      CALL_UniformMatrix2fv(ctx->Exec, (location, count, transpose, m));
    }
 }
 
@@ -6717,7 +6717,7 @@ save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
       n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m));
+      CALL_UniformMatrix3fv(ctx->Exec, (location, count, transpose, m));
    }
 }
 
@@ -6736,7 +6736,7 @@ save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
       n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m));
+      CALL_UniformMatrix4fv(ctx->Exec, (location, count, transpose, m));
    }
 }
 
@@ -6869,7 +6869,7 @@ save_ClampColorARB(GLenum target, GLenum clamp)
       n[2].e = clamp;
    }
    if (ctx->ExecuteFlag) {
-      CALL_ClampColorARB(ctx->Exec, (target, clamp));
+      CALL_ClampColor(ctx->Exec, (target, clamp));
    }
 }
 
@@ -6959,7 +6959,7 @@ save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
       n[6].i = params[3];
    }
    if (ctx->ExecuteFlag) {
-      CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params));
+      CALL_TexParameterIiv(ctx->Exec, (target, pname, params));
    }
 }
 
@@ -6980,7 +6980,7 @@ save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
       n[6].ui = params[3];
    }
    if (ctx->ExecuteFlag) {
-      CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params));
+      CALL_TexParameterIuiv(ctx->Exec, (target, pname, params));
    }
 }
 
@@ -6990,7 +6990,7 @@ exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params));
+   CALL_GetTexParameterIiv(ctx->Exec, (target, pname, params));
 }
 
 /** GL_EXT_texture_integer */
@@ -6999,7 +6999,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));
+   CALL_GetTexParameterIuiv(ctx->Exec, (target, pname, params));
 }
 
 
@@ -7016,7 +7016,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor)
       n[2].ui = divisor;
    }
    if (ctx->ExecuteFlag) {
-      CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor));
+      CALL_VertexAttribDivisor(ctx->Exec, (index, divisor));
    }
 }
 
@@ -7257,7 +7257,7 @@ save_BeginConditionalRender(GLuint queryId, GLenum mode)
       n[2].e = mode;
    }
    if (ctx->ExecuteFlag) {
-      CALL_BeginConditionalRenderNV(ctx->Exec, (queryId, mode));
+      CALL_BeginConditionalRender(ctx->Exec, (queryId, mode));
    }
 }
 
@@ -7268,7 +7268,7 @@ save_EndConditionalRender(void)
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    alloc_instruction(ctx, OPCODE_END_CONDITIONAL_RENDER, 0);
    if (ctx->ExecuteFlag) {
-      CALL_EndConditionalRenderNV(ctx->Exec, ());
+      CALL_EndConditionalRender(ctx->Exec, ());
    }
 }
 
@@ -7412,10 +7412,10 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_BlendEquation(ctx->Exec, (n[1].e));
             break;
          case OPCODE_BLEND_EQUATION_SEPARATE:
-            CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e));
+            CALL_BlendEquationSeparate(ctx->Exec, (n[1].e, n[2].e));
             break;
          case OPCODE_BLEND_FUNC_SEPARATE:
-            CALL_BlendFuncSeparateEXT(ctx->Exec,
+            CALL_BlendFuncSeparate(ctx->Exec,
                                       (n[1].e, n[2].e, n[3].e, n[4].e));
             break;
 
@@ -7520,7 +7520,7 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b));
             break;
          case OPCODE_COLOR_MASK_INDEXED:
-            CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b,
+            CALL_ColorMaski(ctx->Exec, (n[1].ui, n[2].b, n[3].b,
                                                  n[4].b, n[5].b));
             break;
          case OPCODE_COLOR_MATERIAL:
@@ -7666,7 +7666,7 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_Disable(ctx->Exec, (n[1].e));
             break;
          case OPCODE_DISABLE_INDEXED:
-            CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
+            CALL_Disablei(ctx->Exec, (n[1].ui, n[2].e));
             break;
          case OPCODE_DRAW_BUFFER:
             CALL_DrawBuffer(ctx->Exec, (n[1].e));
@@ -7684,7 +7684,7 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_Enable(ctx->Exec, (n[1].e));
             break;
          case OPCODE_ENABLE_INDEXED:
-            CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
+            CALL_Enablei(ctx->Exec, (n[1].ui, n[2].e));
             break;
          case OPCODE_EVALMESH1:
             CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i));
@@ -7852,7 +7852,7 @@ execute_list(struct gl_context *ctx, GLuint list)
                params[0] = n[2].f;
                params[1] = n[3].f;
                params[2] = n[4].f;
-               CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params));
+               CALL_PointParameterfv(ctx->Exec, (n[1].e, params));
             }
             break;
          case OPCODE_POLYGON_MODE:
@@ -7915,7 +7915,7 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_ShadeModel(ctx->Exec, (n[1].e));
             break;
          case OPCODE_PROVOKING_VERTEX:
-            CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));
+            CALL_ProvokingVertex(ctx->Exec, (n[1].e));
             break;
          case OPCODE_STENCIL_FUNC:
             CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));
@@ -8058,49 +8058,49 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
             break;
          case OPCODE_ACTIVE_TEXTURE:   /* GL_ARB_multitexture */
-            CALL_ActiveTextureARB(ctx->Exec, (n[1].e));
+            CALL_ActiveTexture(ctx->Exec, (n[1].e));
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_1D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+            CALL_CompressedTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
                                                      n[4].i, n[5].i, n[6].i,
                                                      n[7].data));
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_2D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+            CALL_CompressedTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
                                                      n[4].i, n[5].i, n[6].i,
                                                      n[7].i, n[8].data));
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_3D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+            CALL_CompressedTexImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
                                                      n[4].i, n[5].i, n[6].i,
                                                      n[7].i, n[8].i,
                                                      n[9].data));
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage1DARB(ctx->Exec,
+            CALL_CompressedTexSubImage1D(ctx->Exec,
                                             (n[1].e, n[2].i, n[3].i, n[4].i,
                                              n[5].e, n[6].i, n[7].data));
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage2DARB(ctx->Exec,
+            CALL_CompressedTexSubImage2D(ctx->Exec,
                                             (n[1].e, n[2].i, n[3].i, n[4].i,
                                              n[5].i, n[6].i, n[7].e, n[8].i,
                                              n[9].data));
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage3DARB(ctx->Exec,
+            CALL_CompressedTexSubImage3D(ctx->Exec,
                                             (n[1].e, n[2].i, n[3].i, n[4].i,
                                              n[5].i, n[6].i, n[7].i, n[8].i,
                                              n[9].e, n[10].i, n[11].data));
             break;
          case OPCODE_SAMPLE_COVERAGE:  /* GL_ARB_multisample */
-            CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b));
+            CALL_SampleCoverage(ctx->Exec, (n[1].f, n[2].b));
             break;
          case OPCODE_WINDOW_POS_ARB:   /* GL_ARB_window_pos */
-            CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f));
+            CALL_WindowPos3f(ctx->Exec, (n[1].f, n[2].f, n[3].f));
             break;
          case OPCODE_BIND_PROGRAM_NV:  /* GL_ARB_vertex_program */
-            CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui));
+            CALL_BindProgramARB(ctx->Exec, (n[1].e, n[2].ui));
             break;
          case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB:
             CALL_ProgramLocalParameter4fARB(ctx->Exec,
@@ -8123,10 +8123,10 @@ execute_list(struct gl_context *ctx, GLuint list)
                                                       n[6].f));
             break;
          case OPCODE_BEGIN_QUERY_ARB:
-            CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
+            CALL_BeginQuery(ctx->Exec, (n[1].e, n[2].ui));
             break;
          case OPCODE_END_QUERY_ARB:
-            CALL_EndQueryARB(ctx->Exec, (n[1].e));
+            CALL_EndQuery(ctx->Exec, (n[1].e));
             break;
          case OPCODE_QUERY_COUNTER:
             CALL_QueryCounter(ctx->Exec, (n[1].ui, n[2].e));
@@ -8143,16 +8143,16 @@ execute_list(struct gl_context *ctx, GLuint list)
                GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS);
                for (i = 0; i < count; i++)
                   buffers[i] = n[2 + i].e;
-               CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers));
+               CALL_DrawBuffers(ctx->Exec, (n[1].i, buffers));
             }
             break;
 	 case OPCODE_BLIT_FRAMEBUFFER:
-	    CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
+	    CALL_BlitFramebuffer(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
                                                 n[5].i, n[6].i, n[7].i, n[8].i,
                                                 n[9].i, n[10].e));
 	    break;
 	 case OPCODE_USE_PROGRAM:
-	    CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui));
+	    CALL_UseProgram(ctx->Exec, (n[1].ui));
 	    break;
 	 case OPCODE_USE_SHADER_PROGRAM_EXT:
 	    CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui));
@@ -8161,54 +8161,54 @@ execute_list(struct gl_context *ctx, GLuint list)
 	    CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui));
 	    break;
 	 case OPCODE_UNIFORM_1F:
-	    CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f));
+	    CALL_Uniform1f(ctx->Exec, (n[1].i, n[2].f));
 	    break;
 	 case OPCODE_UNIFORM_2F:
-	    CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f));
+	    CALL_Uniform2f(ctx->Exec, (n[1].i, n[2].f, n[3].f));
 	    break;
 	 case OPCODE_UNIFORM_3F:
-	    CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));
+	    CALL_Uniform3f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));
 	    break;
 	 case OPCODE_UNIFORM_4F:
-	    CALL_Uniform4fARB(ctx->Exec,
+	    CALL_Uniform4f(ctx->Exec,
                               (n[1].i, n[2].f, n[3].f, n[4].f, n[5].f));
 	    break;
 	 case OPCODE_UNIFORM_1FV:
-	    CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform1fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_2FV:
-	    CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform2fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_3FV:
-	    CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform3fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_4FV:
-	    CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform4fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_1I:
-	    CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i));
+	    CALL_Uniform1i(ctx->Exec, (n[1].i, n[2].i));
 	    break;
 	 case OPCODE_UNIFORM_2I:
-	    CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));
+	    CALL_Uniform2i(ctx->Exec, (n[1].i, n[2].i, n[3].i));
 	    break;
 	 case OPCODE_UNIFORM_3I:
-	    CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
+	    CALL_Uniform3i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
 	    break;
 	 case OPCODE_UNIFORM_4I:
-	    CALL_Uniform4iARB(ctx->Exec,
+	    CALL_Uniform4i(ctx->Exec,
                               (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));
 	    break;
 	 case OPCODE_UNIFORM_1IV:
-	    CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform1iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_2IV:
-	    CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform2iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_3IV:
-	    CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform3iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_4IV:
-	    CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+	    CALL_Uniform4iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
 	    break;
 	 case OPCODE_UNIFORM_1UI:
 	    /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/
@@ -8237,15 +8237,15 @@ execute_list(struct gl_context *ctx, GLuint list)
 	    /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
 	    break;
 	 case OPCODE_UNIFORM_MATRIX22:
-	    CALL_UniformMatrix2fvARB(ctx->Exec,
+	    CALL_UniformMatrix2fv(ctx->Exec,
                                      (n[1].i, n[2].i, n[3].b, n[4].data));
 	    break;
 	 case OPCODE_UNIFORM_MATRIX33:
-	    CALL_UniformMatrix3fvARB(ctx->Exec,
+	    CALL_UniformMatrix3fv(ctx->Exec,
                                      (n[1].i, n[2].i, n[3].b, n[4].data));
 	    break;
 	 case OPCODE_UNIFORM_MATRIX44:
-	    CALL_UniformMatrix4fvARB(ctx->Exec,
+	    CALL_UniformMatrix4fv(ctx->Exec,
                                      (n[1].i, n[2].i, n[3].b, n[4].data));
 	    break;
 	 case OPCODE_UNIFORM_MATRIX23:
@@ -8274,7 +8274,7 @@ execute_list(struct gl_context *ctx, GLuint list)
 	    break;
 
          case OPCODE_CLAMP_COLOR:
-            CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e));
+            CALL_ClampColor(ctx->Exec, (n[1].e, n[2].e));
             break;
 
          case OPCODE_TEX_BUMP_PARAMETER_ATI:
@@ -8407,7 +8407,7 @@ execute_list(struct gl_context *ctx, GLuint list)
                params[1] = n[4].i;
                params[2] = n[5].i;
                params[3] = n[6].i;
-               CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params));
+               CALL_TexParameterIiv(ctx->Exec, (n[1].e, n[2].e, params));
             }
             break;
          case OPCODE_TEXPARAMETER_UI:
@@ -8417,13 +8417,13 @@ execute_list(struct gl_context *ctx, GLuint list)
                params[1] = n[4].ui;
                params[2] = n[5].ui;
                params[3] = n[6].ui;
-               CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params));
+               CALL_TexParameterIuiv(ctx->Exec, (n[1].e, n[2].e, params));
             }
             break;
 
          case OPCODE_VERTEX_ATTRIB_DIVISOR:
             /* GL_ARB_instanced_arrays */
-            CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui));
+            CALL_VertexAttribDivisor(ctx->Exec, (n[1].ui, n[2].ui));
             break;
 
          case OPCODE_TEXTURE_BARRIER_NV:
@@ -8432,10 +8432,10 @@ execute_list(struct gl_context *ctx, GLuint list)
 
          /* GL_EXT/ARB_transform_feedback */
          case OPCODE_BEGIN_TRANSFORM_FEEDBACK:
-            CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e));
+            CALL_BeginTransformFeedback(ctx->Exec, (n[1].e));
             break;
          case OPCODE_END_TRANSFORM_FEEDBACK:
-            CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+            CALL_EndTransformFeedback(ctx->Exec, ());
             break;
          case OPCODE_BIND_TRANSFORM_FEEDBACK:
             CALL_BindTransformFeedback(ctx->Exec, (n[1].e, n[2].ui));
@@ -8532,10 +8532,10 @@ execute_list(struct gl_context *ctx, GLuint list)
 
          /* GL_NV_conditional_render */
          case OPCODE_BEGIN_CONDITIONAL_RENDER:
-            CALL_BeginConditionalRenderNV(ctx->Exec, (n[1].i, n[2].e));
+            CALL_BeginConditionalRender(ctx->Exec, (n[1].i, n[2].e));
             break;
          case OPCODE_END_CONDITIONAL_RENDER:
-            CALL_EndConditionalRenderNV(ctx->Exec, ());
+            CALL_EndConditionalRender(ctx->Exec, ());
             break;
 
          case OPCODE_UNIFORM_BLOCK_BINDING:
@@ -9280,7 +9280,7 @@ exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img));
+   CALL_GetCompressedTexImage(ctx->Exec, (target, level, img));
 }
 
 static void GLAPIENTRY
@@ -9508,7 +9508,7 @@ exec_ClientActiveTextureARB(GLenum target)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_ClientActiveTextureARB(ctx->Exec, (target));
+   CALL_ClientActiveTexture(ctx->Exec, (target));
 }
 
 static void GLAPIENTRY
@@ -9517,7 +9517,7 @@ exec_SecondaryColorPointerEXT(GLint size, GLenum type,
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr));
+   CALL_SecondaryColorPointer(ctx->Exec, (size, type, stride, ptr));
 }
 
 static void GLAPIENTRY
@@ -9525,7 +9525,7 @@ exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr));
+   CALL_FogCoordPointer(ctx->Exec, (type, stride, ptr));
 }
 
 /* GL_EXT_multi_draw_arrays */
@@ -9535,7 +9535,7 @@ exec_MultiDrawArraysEXT(GLenum mode, const GLint *first,
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));
+   CALL_MultiDrawArrays(ctx->Exec, (mode, first, count, primcount));
 }
 
 /* GL_IBM_multimode_draw_arrays */
@@ -9599,7 +9599,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_ClearStencil(table, save_ClearStencil);
    SET_ClipPlane(table, save_ClipPlane);
    SET_ColorMask(table, save_ColorMask);
-   SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed);
+   SET_ColorMaski(table, save_ColorMaskIndexed);
    SET_ColorMaterial(table, save_ColorMaterial);
    SET_CopyPixels(table, save_CopyPixels);
    SET_CullFace(table, save_CullFace);
@@ -9608,11 +9608,11 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_DepthMask(table, save_DepthMask);
    SET_DepthRange(table, save_DepthRange);
    SET_Disable(table, save_Disable);
-   SET_DisableIndexedEXT(table, save_DisableIndexed);
+   SET_Disablei(table, save_DisableIndexed);
    SET_DrawBuffer(table, save_DrawBuffer);
    SET_DrawPixels(table, save_DrawPixels);
    SET_Enable(table, save_Enable);
-   SET_EnableIndexedEXT(table, save_EnableIndexed);
+   SET_Enablei(table, save_EnableIndexed);
    SET_EndList(table, _mesa_EndList);
    SET_EvalMesh1(table, save_EvalMesh1);
    SET_EvalMesh2(table, save_EvalMesh2);
@@ -9878,45 +9878,45 @@ _mesa_create_save_table(const struct gl_context *ctx)
 #endif
 
    /* 54. GL_EXT_point_parameters */
-   SET_PointParameterfEXT(table, save_PointParameterfEXT);
-   SET_PointParameterfvEXT(table, save_PointParameterfvEXT);
+   SET_PointParameterf(table, save_PointParameterfEXT);
+   SET_PointParameterfv(table, save_PointParameterfvEXT);
 
    /* 97. GL_EXT_compiled_vertex_array */
    SET_LockArraysEXT(table, exec_LockArraysEXT);
    SET_UnlockArraysEXT(table, exec_UnlockArraysEXT);
 
    /* 145. GL_EXT_secondary_color */
-   SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT);
+   SET_SecondaryColorPointer(table, exec_SecondaryColorPointerEXT);
 
    /* 148. GL_EXT_multi_draw_arrays */
-   SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);
+   SET_MultiDrawArrays(table, exec_MultiDrawArraysEXT);
 
    /* 149. GL_EXT_fog_coord */
-   SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);
+   SET_FogCoordPointer(table, exec_FogCoordPointerEXT);
 
    /* 173. GL_EXT_blend_func_separate */
-   SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT);
+   SET_BlendFuncSeparate(table, save_BlendFuncSeparateEXT);
 
    /* 196. GL_MESA_resize_buffers */
    SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA);
 
    /* 197. GL_MESA_window_pos */
-   SET_WindowPos2dMESA(table, save_WindowPos2dMESA);
-   SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA);
-   SET_WindowPos2fMESA(table, save_WindowPos2fMESA);
-   SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA);
-   SET_WindowPos2iMESA(table, save_WindowPos2iMESA);
-   SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA);
-   SET_WindowPos2sMESA(table, save_WindowPos2sMESA);
-   SET_WindowPos2svMESA(table, save_WindowPos2svMESA);
-   SET_WindowPos3dMESA(table, save_WindowPos3dMESA);
-   SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA);
-   SET_WindowPos3fMESA(table, save_WindowPos3fMESA);
-   SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA);
-   SET_WindowPos3iMESA(table, save_WindowPos3iMESA);
-   SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA);
-   SET_WindowPos3sMESA(table, save_WindowPos3sMESA);
-   SET_WindowPos3svMESA(table, save_WindowPos3svMESA);
+   SET_WindowPos2d(table, save_WindowPos2dMESA);
+   SET_WindowPos2dv(table, save_WindowPos2dvMESA);
+   SET_WindowPos2f(table, save_WindowPos2fMESA);
+   SET_WindowPos2fv(table, save_WindowPos2fvMESA);
+   SET_WindowPos2i(table, save_WindowPos2iMESA);
+   SET_WindowPos2iv(table, save_WindowPos2ivMESA);
+   SET_WindowPos2s(table, save_WindowPos2sMESA);
+   SET_WindowPos2sv(table, save_WindowPos2svMESA);
+   SET_WindowPos3d(table, save_WindowPos3dMESA);
+   SET_WindowPos3dv(table, save_WindowPos3dvMESA);
+   SET_WindowPos3f(table, save_WindowPos3fMESA);
+   SET_WindowPos3fv(table, save_WindowPos3fvMESA);
+   SET_WindowPos3i(table, save_WindowPos3iMESA);
+   SET_WindowPos3iv(table, save_WindowPos3ivMESA);
+   SET_WindowPos3s(table, save_WindowPos3sMESA);
+   SET_WindowPos3sv(table, save_WindowPos3svMESA);
    SET_WindowPos4dMESA(table, save_WindowPos4dMESA);
    SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA);
    SET_WindowPos4fMESA(table, save_WindowPos4fMESA);
@@ -9935,10 +9935,10 @@ _mesa_create_save_table(const struct gl_context *ctx)
     * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,
     * VertexAttribPointerNV, GetProgram*, GetVertexAttrib*
     */
-   SET_BindProgramNV(table, save_BindProgramNV);
-   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
-   SET_GenProgramsNV(table, _mesa_GenPrograms);
-   SET_IsProgramNV(table, _mesa_IsProgramARB);
+   SET_BindProgramARB(table, save_BindProgramNV);
+   SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB);
+   SET_GenProgramsARB(table, _mesa_GenProgramsARB);
+   SET_IsProgramARB(table, _mesa_IsProgramARB);
 
    /* 244. GL_ATI_envmap_bumpmap */
    SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI);
@@ -9949,32 +9949,32 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI);
 
    /* 262. GL_NV_point_sprite */
-   SET_PointParameteriNV(table, save_PointParameteriNV);
-   SET_PointParameterivNV(table, save_PointParameterivNV);
+   SET_PointParameteri(table, save_PointParameteriNV);
+   SET_PointParameteriv(table, save_PointParameterivNV);
 
    /* 268. GL_EXT_stencil_two_side */
    SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT);
 
    /* 273. GL_APPLE_vertex_array_object */
    SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE);
-   SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE);
+   SET_DeleteVertexArrays(table, _mesa_DeleteVertexArrays);
    SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE);
-   SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE);
+   SET_IsVertexArray(table, _mesa_IsVertexArray);
 
    /* 310. GL_EXT_framebuffer_object */
-   SET_GenFramebuffersEXT(table, _mesa_GenFramebuffersEXT);
-   SET_BindFramebufferEXT(table, _mesa_BindFramebufferEXT);
-   SET_DeleteFramebuffersEXT(table, _mesa_DeleteFramebuffersEXT);
-   SET_CheckFramebufferStatusEXT(table, _mesa_CheckFramebufferStatusEXT);
-   SET_GenRenderbuffersEXT(table, _mesa_GenRenderbuffersEXT);
-   SET_BindRenderbufferEXT(table, _mesa_BindRenderbufferEXT);
-   SET_DeleteRenderbuffersEXT(table, _mesa_DeleteRenderbuffersEXT);
-   SET_RenderbufferStorageEXT(table, _mesa_RenderbufferStorageEXT);
-   SET_FramebufferTexture1DEXT(table, _mesa_FramebufferTexture1DEXT);
-   SET_FramebufferTexture2DEXT(table, _mesa_FramebufferTexture2DEXT);
-   SET_FramebufferTexture3DEXT(table, _mesa_FramebufferTexture3DEXT);
-   SET_FramebufferRenderbufferEXT(table, _mesa_FramebufferRenderbufferEXT);
-   SET_GenerateMipmapEXT(table, _mesa_GenerateMipmapEXT);
+   SET_GenFramebuffers(table, _mesa_GenFramebuffers);
+   SET_BindFramebuffer(table, _mesa_BindFramebuffer);
+   SET_DeleteFramebuffers(table, _mesa_DeleteFramebuffers);
+   SET_CheckFramebufferStatus(table, _mesa_CheckFramebufferStatus);
+   SET_GenRenderbuffers(table, _mesa_GenRenderbuffers);
+   SET_BindRenderbuffer(table, _mesa_BindRenderbuffer);
+   SET_DeleteRenderbuffers(table, _mesa_DeleteRenderbuffers);
+   SET_RenderbufferStorage(table, _mesa_RenderbufferStorage);
+   SET_FramebufferTexture1D(table, _mesa_FramebufferTexture1D);
+   SET_FramebufferTexture2D(table, _mesa_FramebufferTexture2D);
+   SET_FramebufferTexture3D(table, _mesa_FramebufferTexture3D);
+   SET_FramebufferRenderbuffer(table, _mesa_FramebufferRenderbuffer);
+   SET_GenerateMipmap(table, _mesa_GenerateMipmap);
 
    /* 317. GL_EXT_framebuffer_multisample */
    SET_RenderbufferStorageMultisample(table, _mesa_RenderbufferStorageMultisample);
@@ -9987,26 +9987,26 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_DepthBoundsEXT(table, save_DepthBoundsEXT);
 
    /* ARB 1. GL_ARB_multitexture */
-   SET_ActiveTextureARB(table, save_ActiveTextureARB);
-   SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB);
+   SET_ActiveTexture(table, save_ActiveTextureARB);
+   SET_ClientActiveTexture(table, exec_ClientActiveTextureARB);
 
    /* ARB 3. GL_ARB_transpose_matrix */
-   SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB);
-   SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB);
-   SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB);
-   SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB);
+   SET_LoadTransposeMatrixd(table, save_LoadTransposeMatrixdARB);
+   SET_LoadTransposeMatrixf(table, save_LoadTransposeMatrixfARB);
+   SET_MultTransposeMatrixd(table, save_MultTransposeMatrixdARB);
+   SET_MultTransposeMatrixf(table, save_MultTransposeMatrixfARB);
 
    /* ARB 5. GL_ARB_multisample */
-   SET_SampleCoverageARB(table, save_SampleCoverageARB);
+   SET_SampleCoverage(table, save_SampleCoverageARB);
 
    /* ARB 12. GL_ARB_texture_compression */
-   SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB);
-   SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB);
-   SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB);
-   SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB);
-   SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB);
-   SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB);
-   SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB);
+   SET_CompressedTexImage3D(table, save_CompressedTexImage3DARB);
+   SET_CompressedTexImage2D(table, save_CompressedTexImage2DARB);
+   SET_CompressedTexImage1D(table, save_CompressedTexImage1DARB);
+   SET_CompressedTexSubImage3D(table, save_CompressedTexSubImage3DARB);
+   SET_CompressedTexSubImage2D(table, save_CompressedTexSubImage2DARB);
+   SET_CompressedTexSubImage1D(table, save_CompressedTexSubImage1DARB);
+   SET_GetCompressedTexImage(table, exec_GetCompressedTexImageARB);
 
    /* ARB 14. GL_ARB_point_parameters */
    /* aliased with EXT_point_parameters functions */
@@ -10017,18 +10017,18 @@ _mesa_create_save_table(const struct gl_context *ctx)
    /* ARB 26. GL_ARB_vertex_program */
    /* ARB 27. GL_ARB_fragment_program */
    /* glVertexAttrib* functions alias the NV ones, handled elsewhere */
-   SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB);
-   SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB);
-   SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB);
+   SET_VertexAttribPointer(table, _mesa_VertexAttribPointer);
+   SET_EnableVertexAttribArray(table, _mesa_EnableVertexAttribArray);
+   SET_DisableVertexAttribArray(table, _mesa_DisableVertexAttribArray);
    SET_ProgramStringARB(table, save_ProgramStringARB);
-   SET_BindProgramNV(table, save_BindProgramNV);
-   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
-   SET_GenProgramsNV(table, _mesa_GenPrograms);
-   SET_IsProgramNV(table, _mesa_IsProgramARB);
-   SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB);
-   SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB);
-   SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB);
-   SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervARB);
+   SET_BindProgramARB(table, save_BindProgramNV);
+   SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB);
+   SET_GenProgramsARB(table, _mesa_GenProgramsARB);
+   SET_IsProgramARB(table, _mesa_IsProgramARB);
+   SET_GetVertexAttribdv(table, _mesa_GetVertexAttribdv);
+   SET_GetVertexAttribfv(table, _mesa_GetVertexAttribfv);
+   SET_GetVertexAttribiv(table, _mesa_GetVertexAttribiv);
+   SET_GetVertexAttribPointerv(table, _mesa_GetVertexAttribPointerv);
    SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
    SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
    SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
@@ -10048,49 +10048,49 @@ _mesa_create_save_table(const struct gl_context *ctx)
 
    /* ARB 28. GL_ARB_vertex_buffer_object */
    /* None of the extension's functions get compiled */
-   SET_BindBufferARB(table, _mesa_BindBufferARB);
-   SET_BufferDataARB(table, _mesa_BufferDataARB);
-   SET_BufferSubDataARB(table, _mesa_BufferSubDataARB);
-   SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB);
-   SET_GenBuffersARB(table, _mesa_GenBuffersARB);
-   SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB);
-   SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB);
-   SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB);
-   SET_IsBufferARB(table, _mesa_IsBufferARB);
-   SET_MapBufferARB(table, _mesa_MapBufferARB);
-   SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
+   SET_BindBuffer(table, _mesa_BindBuffer);
+   SET_BufferData(table, _mesa_BufferData);
+   SET_BufferSubData(table, _mesa_BufferSubData);
+   SET_DeleteBuffers(table, _mesa_DeleteBuffers);
+   SET_GenBuffers(table, _mesa_GenBuffers);
+   SET_GetBufferParameteriv(table, _mesa_GetBufferParameteriv);
+   SET_GetBufferPointerv(table, _mesa_GetBufferPointerv);
+   SET_GetBufferSubData(table, _mesa_GetBufferSubData);
+   SET_IsBuffer(table, _mesa_IsBuffer);
+   SET_MapBuffer(table, _mesa_MapBuffer);
+   SET_UnmapBuffer(table, _mesa_UnmapBuffer);
 
    _mesa_init_queryobj_dispatch(ctx, table); /* glGetQuery, etc */
-   SET_BeginQueryARB(table, save_BeginQueryARB);
-   SET_EndQueryARB(table, save_EndQueryARB);
+   SET_BeginQuery(table, save_BeginQueryARB);
+   SET_EndQuery(table, save_EndQueryARB);
    SET_QueryCounter(table, save_QueryCounter);
 
-   SET_DrawBuffersARB(table, save_DrawBuffersARB);
+   SET_DrawBuffers(table, save_DrawBuffersARB);
 
-   SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT);
+   SET_BlitFramebuffer(table, save_BlitFramebufferEXT);
 
    /* GL_ARB_shader_objects */
    _mesa_init_shader_dispatch(ctx, table); /* Plug in glCreate/Delete/Get, etc */
-   SET_UseProgramObjectARB(table, save_UseProgramObjectARB);
-   SET_Uniform1fARB(table, save_Uniform1fARB);
-   SET_Uniform2fARB(table, save_Uniform2fARB);
-   SET_Uniform3fARB(table, save_Uniform3fARB);
-   SET_Uniform4fARB(table, save_Uniform4fARB);
-   SET_Uniform1fvARB(table, save_Uniform1fvARB);
-   SET_Uniform2fvARB(table, save_Uniform2fvARB);
-   SET_Uniform3fvARB(table, save_Uniform3fvARB);
-   SET_Uniform4fvARB(table, save_Uniform4fvARB);
-   SET_Uniform1iARB(table, save_Uniform1iARB);
-   SET_Uniform2iARB(table, save_Uniform2iARB);
-   SET_Uniform3iARB(table, save_Uniform3iARB);
-   SET_Uniform4iARB(table, save_Uniform4iARB);
-   SET_Uniform1ivARB(table, save_Uniform1ivARB);
-   SET_Uniform2ivARB(table, save_Uniform2ivARB);
-   SET_Uniform3ivARB(table, save_Uniform3ivARB);
-   SET_Uniform4ivARB(table, save_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB);
+   SET_UseProgram(table, save_UseProgramObjectARB);
+   SET_Uniform1f(table, save_Uniform1fARB);
+   SET_Uniform2f(table, save_Uniform2fARB);
+   SET_Uniform3f(table, save_Uniform3fARB);
+   SET_Uniform4f(table, save_Uniform4fARB);
+   SET_Uniform1fv(table, save_Uniform1fvARB);
+   SET_Uniform2fv(table, save_Uniform2fvARB);
+   SET_Uniform3fv(table, save_Uniform3fvARB);
+   SET_Uniform4fv(table, save_Uniform4fvARB);
+   SET_Uniform1i(table, save_Uniform1iARB);
+   SET_Uniform2i(table, save_Uniform2iARB);
+   SET_Uniform3i(table, save_Uniform3iARB);
+   SET_Uniform4i(table, save_Uniform4iARB);
+   SET_Uniform1iv(table, save_Uniform1ivARB);
+   SET_Uniform2iv(table, save_Uniform2ivARB);
+   SET_Uniform3iv(table, save_Uniform3ivARB);
+   SET_Uniform4iv(table, save_Uniform4ivARB);
+   SET_UniformMatrix2fv(table, save_UniformMatrix2fvARB);
+   SET_UniformMatrix3fv(table, save_UniformMatrix3fvARB);
+   SET_UniformMatrix4fv(table, save_UniformMatrix4fvARB);
    SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv);
    SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv);
    SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv);
@@ -10099,13 +10099,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv);
 
    /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */
-   SET_BindAttribLocationARB(table, exec_BindAttribLocationARB);
-   SET_GetAttribLocationARB(table, exec_GetAttribLocationARB);
-   SET_GetUniformLocationARB(table, exec_GetUniformLocationARB);
+   SET_BindAttribLocation(table, exec_BindAttribLocationARB);
+   SET_GetAttribLocation(table, exec_GetAttribLocationARB);
+   SET_GetUniformLocation(table, exec_GetUniformLocationARB);
    /* XXX additional functions need to be implemented here! */
 
    /* 299. GL_EXT_blend_equation_separate */
-   SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT);
+   SET_BlendEquationSeparate(table, save_BlendEquationSeparateEXT);
 
    /* GL_EXT_gpu_program_parameters */
    SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
@@ -10116,13 +10116,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
 
    /* ARB 51. GL_ARB_texture_buffer_object */
-   SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */
+   SET_TexBuffer(table, _mesa_TexBuffer); /* no dlist save */
 
    /* ARB 59. GL_ARB_copy_buffer */
    SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 
    /* 364. GL_EXT_provoking_vertex */
-   SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
+   SET_ProvokingVertex(table, save_ProvokingVertexEXT);
 
    /* 371. GL_APPLE_object_purgeable */
    SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);
@@ -10132,17 +10132,17 @@ _mesa_create_save_table(const struct gl_context *ctx)
    /* GL_EXT_texture_integer */
    SET_ClearColorIiEXT(table, save_ClearColorIi);
    SET_ClearColorIuiEXT(table, save_ClearColorIui);
-   SET_TexParameterIivEXT(table, save_TexParameterIiv);
-   SET_TexParameterIuivEXT(table, save_TexParameterIuiv);
-   SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv);
-   SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv);
+   SET_TexParameterIiv(table, save_TexParameterIiv);
+   SET_TexParameterIuiv(table, save_TexParameterIuiv);
+   SET_GetTexParameterIiv(table, exec_GetTexParameterIiv);
+   SET_GetTexParameterIuiv(table, exec_GetTexParameterIuiv);
 
    /* 377. GL_EXT_separate_shader_objects */
    SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT);
    SET_ActiveProgramEXT(table, save_ActiveProgramEXT);
 
    /* GL_ARB_color_buffer_float */
-   SET_ClampColorARB(table, save_ClampColorARB);
+   SET_ClampColor(table, save_ClampColorARB);
 
    /* GL 3.0 */
    SET_ClearBufferiv(table, save_ClearBufferiv);
@@ -10170,13 +10170,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
 #endif
 
    /* These are not compiled into display lists: */
-   SET_BindBufferBaseEXT(table, _mesa_BindBufferBase);
+   SET_BindBufferBase(table, _mesa_BindBufferBase);
    SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT);
-   SET_BindBufferRangeEXT(table, _mesa_BindBufferRange);
-   SET_TransformFeedbackVaryingsEXT(table, _mesa_TransformFeedbackVaryings);
+   SET_BindBufferRange(table, _mesa_BindBufferRange);
+   SET_TransformFeedbackVaryings(table, _mesa_TransformFeedbackVaryings);
    /* These are: */
-   SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback);
-   SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback);
+   SET_BeginTransformFeedback(table, save_BeginTransformFeedback);
+   SET_EndTransformFeedback(table, save_EndTransformFeedback);
    SET_BindTransformFeedback(table, save_BindTransformFeedback);
    SET_PauseTransformFeedback(table, save_PauseTransformFeedback);
    SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback);
@@ -10190,7 +10190,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_EndQueryIndexed(table, save_EndQueryIndexed);
 
    /* GL_ARB_instanced_arrays */
-   SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);
+   SET_VertexAttribDivisor(table, save_VertexAttribDivisor);
 
    /* GL_NV_texture_barrier */
    SET_TextureBarrierNV(table, save_TextureBarrierNV);
@@ -10217,8 +10217,8 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
 
    /* GL_NV_conditional_render */
-   SET_BeginConditionalRenderNV(table, save_BeginConditionalRender);
-   SET_EndConditionalRenderNV(table, save_EndConditionalRender);
+   SET_BeginConditionalRender(table, save_BeginConditionalRender);
+   SET_EndConditionalRender(table, save_EndConditionalRender);
 
    /* GL_ARB_sync */
    _mesa_init_sync_dispatch(table);
@@ -10239,7 +10239,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_UniformBlockBinding(table, save_UniformBlockBinding);
 
    /* GL_NV_primitive_restart */
-   SET_PrimitiveRestartIndexNV(table, _mesa_PrimitiveRestartIndex);
+   SET_PrimitiveRestartIndex(table, _mesa_PrimitiveRestartIndex);
 
    return table;
 }
diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index d5cac22bd3b..7285805c871 100644
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
 
 
 void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, x, y, z, width, height);
@@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
 
 
 void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords)
+_mesa_DrawTexfvOES(const GLfloat *coords)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
@@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords)
 
 
 void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
 
 
 void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords)
+_mesa_DrawTexivOES(const GLint *coords)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
@@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords)
 
 
 void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
 
 
 void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords)
+_mesa_DrawTexsvOES(const GLshort *coords)
 {
    GET_CURRENT_CONTEXT(ctx);
    draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h
index 938b65fb2e9..b916150b7c2 100644
--- a/src/mesa/main/drawtex.h
+++ b/src/mesa/main/drawtex.h
@@ -30,22 +30,22 @@
 
 
 extern void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
 
 extern void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords);
+_mesa_DrawTexfvOES(const GLfloat *coords);
 
 extern void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
+_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height);
 
 extern void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords);
+_mesa_DrawTexivOES(const GLint *coords);
 
 extern void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
 
 extern void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords);
+_mesa_DrawTexsvOES(const GLshort *coords);
 
 extern void GLAPIENTRY
 _mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index e704f2f2da2..c7114b73a67 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1072,7 +1072,7 @@ invalid_enum_error:
 
 
 void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index )
+_mesa_Disablei( GLenum cap, GLuint index )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1081,7 +1081,7 @@ _mesa_DisableIndexed( GLenum cap, GLuint index )
 
 
 void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index )
+_mesa_Enablei( GLenum cap, GLuint index )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1090,7 +1090,7 @@ _mesa_EnableIndexed( GLenum cap, GLuint index )
 
 
 GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index )
+_mesa_IsEnabledi( GLenum cap, GLuint index )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h
index be790945920..5b2515d593d 100644
--- a/src/mesa/main/enable.h
+++ b/src/mesa/main/enable.h
@@ -53,13 +53,13 @@ extern void
 _mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);
 
 extern void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index );
+_mesa_Disablei( GLenum cap, GLuint index );
 
 extern void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index );
+_mesa_Enablei( GLenum cap, GLuint index );
 
 extern GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index );
+_mesa_IsEnabledi( GLenum cap, GLuint index );
 
 extern void GLAPIENTRY
 _mesa_EnableClientState( GLenum cap );
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c
index 993147c4760..cd527dd78f0 100644
--- a/src/mesa/main/es1_conversion.c
+++ b/src/mesa/main/es1_conversion.c
@@ -30,13 +30,13 @@
 #include "main/es1_conversion.h"
 
 void GL_APIENTRY
-_es_AlphaFuncx(GLenum func, GLclampx ref)
+_mesa_AlphaFuncx(GLenum func, GLclampx ref)
 {
    _mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
+_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
 {
    _mesa_ClearColor((GLclampf) (red / 65536.0f),
                     (GLclampf) (green / 65536.0f),
@@ -45,13 +45,13 @@ _es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
 }
 
 void GL_APIENTRY
-_es_ClearDepthx(GLclampx depth)
+_mesa_ClearDepthx(GLclampx depth)
 {
    _mesa_ClearDepthf((GLclampf) (depth / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_ClipPlanef(GLenum plane, const GLfloat *equation)
+_mesa_ClipPlanef(GLenum plane, const GLfloat *equation)
 {
    unsigned int i;
    GLdouble converted_equation[4];
@@ -64,7 +64,7 @@ _es_ClipPlanef(GLenum plane, const GLfloat *equation)
 }
 
 void GL_APIENTRY
-_es_ClipPlanex(GLenum plane, const GLfixed *equation)
+_mesa_ClipPlanex(GLenum plane, const GLfixed *equation)
 {
    unsigned int i;
    GLdouble converted_equation[4];
@@ -86,7 +86,7 @@ _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 }
 
 void GL_APIENTRY
-_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
+_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
 {
     _es_Color4f((GLfloat) (red / 65536.0f),
                 (GLfloat) (green / 65536.0f),
@@ -95,17 +95,17 @@ _es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
 }
 
 void GL_APIENTRY
-_es_DepthRangex(GLclampx zNear, GLclampx zFar)
+_mesa_DepthRangex(GLclampx zNear, GLclampx zFar)
 {
     _mesa_DepthRangef((GLclampf) (zNear / 65536.0f),
                       (GLclampf) (zFar / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
+_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
 {
 
-    _mesa_DrawTexf((GLfloat) (x / 65536.0f),
+    _mesa_DrawTexfOES((GLfloat) (x / 65536.0f),
                    (GLfloat) (y / 65536.0f),
                    (GLfloat) (z / 65536.0f),
                    (GLfloat) (w / 65536.0f),
@@ -113,7 +113,7 @@ _es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
 }
 
 void GL_APIENTRY
-_es_DrawTexxvOES(const GLfixed *coords)
+_mesa_DrawTexxvOES(const GLfixed *coords)
 {
     unsigned int i;
     GLfloat converted_coords[5];
@@ -122,11 +122,11 @@ _es_DrawTexxvOES(const GLfixed *coords)
         converted_coords[i] = (GLfloat) (coords[i] / 65536.0f);
     }
 
-    _mesa_DrawTexfv(converted_coords);
+    _mesa_DrawTexfvOES(converted_coords);
 }
 
 void GL_APIENTRY
-_es_Fogx(GLenum pname, GLfixed param)
+_mesa_Fogx(GLenum pname, GLfixed param)
 {
    if (pname != GL_FOG_MODE) {
       _mesa_Fogf(pname, (GLfloat) (param / 65536.0f));
@@ -137,7 +137,7 @@ _es_Fogx(GLenum pname, GLfixed param)
 }
 
 void GL_APIENTRY
-_es_Fogxv(GLenum pname, const GLfixed *params)
+_mesa_Fogxv(GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -177,7 +177,7 @@ _es_Fogxv(GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
              GLfloat zNear, GLfloat zFar)
 {
    _mesa_Frustum((GLdouble) (left),
@@ -189,7 +189,7 @@ _es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
 }
 
 void GL_APIENTRY
-_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
              GLfixed zNear, GLfixed zFar)
 {
    _mesa_Frustum((GLdouble) (left / 65536.0),
@@ -201,7 +201,7 @@ _es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
 }
 
 void GL_APIENTRY
-_es_GetClipPlanef(GLenum plane, GLfloat *equation)
+_mesa_GetClipPlanef(GLenum plane, GLfloat *equation)
 {
    unsigned int i;
    GLdouble converted_equation[4];
@@ -213,7 +213,7 @@ _es_GetClipPlanef(GLenum plane, GLfloat *equation)
 }
 
 void GL_APIENTRY
-_es_GetClipPlanex(GLenum plane, GLfixed *equation)
+_mesa_GetClipPlanex(GLenum plane, GLfixed *equation)
 {
    unsigned int i;
    GLdouble converted_equation[4];
@@ -225,7 +225,7 @@ _es_GetClipPlanex(GLenum plane, GLfixed *equation)
 }
 
 void GL_APIENTRY
-_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
+_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -266,7 +266,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
+_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -304,7 +304,7 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
+_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -396,13 +396,13 @@ _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
 }
 
 void GL_APIENTRY
-_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
+_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
 {
    _mesa_GetTexGeniv(coord, pname, (GLint *) params);
 }
 
 void GL_APIENTRY
-_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
+_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -450,13 +450,13 @@ _es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_LightModelx(GLenum pname, GLfixed param)
+_mesa_LightModelx(GLenum pname, GLfixed param)
 {
    _mesa_LightModelf(pname, (GLfloat) param);
 }
 
 void GL_APIENTRY
-_es_LightModelxv(GLenum pname, const GLfixed *params)
+_mesa_LightModelxv(GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -491,13 +491,13 @@ _es_LightModelxv(GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_Lightx(GLenum light, GLenum pname, GLfixed param)
+_mesa_Lightx(GLenum light, GLenum pname, GLfixed param)
 {
    _mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
+_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -539,13 +539,13 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_LineWidthx(GLfixed width)
+_mesa_LineWidthx(GLfixed width)
 {
    _mesa_LineWidth((GLfloat) (width / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_LoadMatrixx(const GLfixed *m)
+_mesa_LoadMatrixx(const GLfixed *m)
 {
    unsigned int i;
    GLfloat converted_m[16];
@@ -558,7 +558,7 @@ _es_LoadMatrixx(const GLfixed *m)
 }
 
 void GL_APIENTRY
-_es_Materialx(GLenum face, GLenum pname, GLfixed param)
+_mesa_Materialx(GLenum face, GLenum pname, GLfixed param)
 {
    if (face != GL_FRONT_AND_BACK) {
       _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
@@ -576,7 +576,7 @@ _es_Materialx(GLenum face, GLenum pname, GLfixed param)
 }
 
 void GL_APIENTRY
-_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
+_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -613,7 +613,7 @@ _es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_MultMatrixx(const GLfixed *m)
+_mesa_MultMatrixx(const GLfixed *m)
 {
    unsigned int i;
    GLfloat converted_m[16];
@@ -626,7 +626,7 @@ _es_MultMatrixx(const GLfixed *m)
 }
 
 void GL_APIENTRY
-_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
+_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
 {
    _es_MultiTexCoord4f(texture,
                        (GLfloat) (s / 65536.0f),
@@ -636,7 +636,7 @@ _es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
 }
 
 void GL_APIENTRY
-_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
+_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
 {
    _es_Normal3f((GLfloat) (nx / 65536.0f),
                 (GLfloat) (ny / 65536.0f),
@@ -644,7 +644,7 @@ _es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
 }
 
 void GL_APIENTRY
-_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
            GLfloat zNear, GLfloat zFar)
 {
    _mesa_Ortho((GLdouble) (left),
@@ -656,7 +656,7 @@ _es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
 }
 
 void GL_APIENTRY
-_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
            GLfixed zNear, GLfixed zFar)
 {
    _mesa_Ortho((GLdouble) (left / 65536.0),
@@ -668,13 +668,13 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
 }
 
 void GL_APIENTRY
-_es_PointParameterx(GLenum pname, GLfixed param)
+_mesa_PointParameterx(GLenum pname, GLfixed param)
 {
    _mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_PointParameterxv(GLenum pname, const GLfixed *params)
+_mesa_PointParameterxv(GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 3;
@@ -703,20 +703,20 @@ _es_PointParameterxv(GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_PointSizex(GLfixed size)
+_mesa_PointSizex(GLfixed size)
 {
    _mesa_PointSize((GLfloat) (size / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_PolygonOffsetx(GLfixed factor, GLfixed units)
+_mesa_PolygonOffsetx(GLfixed factor, GLfixed units)
 {
    _mesa_PolygonOffset((GLfloat) (factor / 65536.0f),
                        (GLfloat) (units / 65536.0f));
 }
 
 void GL_APIENTRY
-_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
+_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
 {
    _mesa_Rotatef((GLfloat) (angle / 65536.0f),
                  (GLfloat) (x / 65536.0f),
@@ -725,14 +725,14 @@ _es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
 }
 
 void GL_APIENTRY
-_es_SampleCoveragex(GLclampx value, GLboolean invert)
+_mesa_SampleCoveragex(GLclampx value, GLboolean invert)
 {
-   _mesa_SampleCoverageARB((GLclampf) (value / 65536.0f),
+   _mesa_SampleCoverage((GLclampf) (value / 65536.0f),
                            invert);
 }
 
 void GL_APIENTRY
-_es_Scalex(GLfixed x, GLfixed y, GLfixed z)
+_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z)
 {
    _mesa_Scalef((GLfloat) (x / 65536.0f),
                 (GLfloat) (y / 65536.0f),
@@ -740,7 +740,7 @@ _es_Scalex(GLfixed x, GLfixed y, GLfixed z)
 }
 
 void GL_APIENTRY
-_es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
+_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param)
 {
    switch(target) {
    case GL_POINT_SPRITE:
@@ -785,7 +785,7 @@ _es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
 }
 
 void GL_APIENTRY
-_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
+_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
 {
    switch(target) {
    case GL_POINT_SPRITE:
@@ -853,19 +853,19 @@ _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params)
 }
 
 void GL_APIENTRY
-_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
+_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
 {
    _es_TexGenf(coord, pname, (GLfloat) param);
 }
 
 void GL_APIENTRY
-_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
+_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
 {
    _es_TexGenf(coord, pname, (GLfloat) params[0]);
 }
 
 void GL_APIENTRY
-_es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
+_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param)
 {
    if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
       _mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
@@ -875,7 +875,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
 }
 
 void GL_APIENTRY
-_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
+_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
 {
    unsigned int i;
    unsigned int n_params = 4;
@@ -930,7 +930,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
 }
 
 void GL_APIENTRY
-_es_Translatex(GLfixed x, GLfixed y, GLfixed z)
+_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z)
 {
     _mesa_Translatef((GLfloat) (x / 65536.0f),
                      (GLfloat) (y / 65536.0f),
diff --git a/src/mesa/main/es1_conversion.h b/src/mesa/main/es1_conversion.h
index eb073475992..868a75bab9b 100644
--- a/src/mesa/main/es1_conversion.h
+++ b/src/mesa/main/es1_conversion.h
@@ -29,140 +29,140 @@
 #endif
 
 void GL_APIENTRY
-_es_AlphaFuncx(GLenum func, GLclampx ref);
+_mesa_AlphaFuncx(GLenum func, GLclampx ref);
 
 void GL_APIENTRY
-_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
 
 void GL_APIENTRY
-_es_ClearDepthx(GLclampx depth);
+_mesa_ClearDepthx(GLclampx depth);
 
 void GL_APIENTRY
-_es_ClipPlanef(GLenum plane, const GLfloat *equation);
+_mesa_ClipPlanef(GLenum plane, const GLfloat *equation);
 
 void GL_APIENTRY
-_es_ClipPlanex(GLenum plane, const GLfixed *equation);
+_mesa_ClipPlanex(GLenum plane, const GLfixed *equation);
 
 void GL_APIENTRY
 _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
 
 void GL_APIENTRY
-_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
 
 void GL_APIENTRY
-_es_DepthRangex(GLclampx zNear, GLclampx zFar);
+_mesa_DepthRangex(GLclampx zNear, GLclampx zFar);
 
 void GL_APIENTRY
-_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
+_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
 
 void GL_APIENTRY
-_es_DrawTexxvOES(const GLfixed *coords);
+_mesa_DrawTexxvOES(const GLfixed *coords);
 
 void GL_APIENTRY
-_es_Fogx(GLenum pname, GLfixed param);
+_mesa_Fogx(GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_Fogxv(GLenum pname, const GLfixed *params);
+_mesa_Fogxv(GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
              GLfloat zNear, GLfloat zFar);
 
 void GL_APIENTRY
-_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
              GLfixed zNear, GLfixed zFar);
 
 void GL_APIENTRY
-_es_GetClipPlanef(GLenum plane, GLfloat *equation);
+_mesa_GetClipPlanef(GLenum plane, GLfloat *equation);
 
 void GL_APIENTRY
-_es_GetClipPlanex(GLenum plane, GLfixed *equation);
+_mesa_GetClipPlanex(GLenum plane, GLfixed *equation);
 
 void GL_APIENTRY
-_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
+_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
 
 void GL_APIENTRY
-_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
+_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
 
 void GL_APIENTRY
 _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params);
 
 void GL_APIENTRY
-_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
+_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
 
 void GL_APIENTRY
-_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
+_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
 
 void GL_APIENTRY
-_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
+_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
 
 void GL_APIENTRY
-_es_LightModelx(GLenum pname, GLfixed param);
+_mesa_LightModelx(GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_LightModelxv(GLenum pname, const GLfixed *params);
+_mesa_LightModelxv(GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_Lightx(GLenum light, GLenum pname, GLfixed param);
+_mesa_Lightx(GLenum light, GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
+_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_LineWidthx(GLfixed width);
+_mesa_LineWidthx(GLfixed width);
 
 void GL_APIENTRY
-_es_LoadMatrixx(const GLfixed *m);
+_mesa_LoadMatrixx(const GLfixed *m);
 
 void GL_APIENTRY
-_es_Materialx(GLenum face, GLenum pname, GLfixed param);
+_mesa_Materialx(GLenum face, GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
+_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_MultMatrixx(const GLfixed *m);
+_mesa_MultMatrixx(const GLfixed *m);
 
 void GL_APIENTRY
-_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
 
 void GL_APIENTRY
-_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
+_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
 
 void GL_APIENTRY
-_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
            GLfloat zNear, GLfloat zFar);
 
 void GL_APIENTRY
-_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
            GLfixed zNear, GLfixed zFar);
 
 void GL_APIENTRY
-_es_PointParameterx(GLenum pname, GLfixed param);
+_mesa_PointParameterx(GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_PointParameterxv(GLenum pname, const GLfixed *params);
+_mesa_PointParameterxv(GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_PointSizex(GLfixed size);
+_mesa_PointSizex(GLfixed size);
 
 void GL_APIENTRY
-_es_PolygonOffsetx(GLfixed factor, GLfixed units);
+_mesa_PolygonOffsetx(GLfixed factor, GLfixed units);
 
 void GL_APIENTRY
-_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
 
 void GL_APIENTRY
-_es_SampleCoveragex(GLclampx value, GLboolean invert);
+_mesa_SampleCoveragex(GLclampx value, GLboolean invert);
 
 void GL_APIENTRY
-_es_Scalex(GLfixed x, GLfixed y, GLfixed z);
+_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z);
 
 void GL_APIENTRY
-_es_TexEnvx(GLenum target, GLenum pname, GLfixed param);
+_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
+_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
 _check_TexGeniOES(GLenum coord, GLenum pname, GLint param);
@@ -171,18 +171,18 @@ void GL_APIENTRY
 _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params);
 
 void GL_APIENTRY
-_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
+_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
+_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_TexParameterx(GLenum target, GLenum pname, GLfixed param);
+_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param);
 
 void GL_APIENTRY
-_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
+_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
 
 void GL_APIENTRY
-_es_Translatex(GLfixed x, GLfixed y, GLfixed z);
+_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z);
 
 #endif /* ES1_CONVERSION_H */
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 0618b7fabec..ef739c162c4 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -883,7 +883,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
 
 
 GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer)
+_mesa_IsRenderbuffer(GLuint renderbuffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -897,7 +897,7 @@ _mesa_IsRenderbufferEXT(GLuint renderbuffer)
 
 
 void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
+_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
    struct gl_renderbuffer *newRb;
    GET_CURRENT_CONTEXT(ctx);
@@ -969,7 +969,7 @@ detach_renderbuffer(struct gl_context *ctx,
 
 
 void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
+_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
    GLint i;
    GET_CURRENT_CONTEXT(ctx);
@@ -986,7 +986,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
             if (rb == ctx->CurrentRenderbuffer) {
                /* bind default */
                ASSERT(rb->RefCount >= 2);
-               _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+               _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
             }
 
             if (_mesa_is_user_fbo(ctx->DrawBuffer)) {
@@ -1014,7 +1014,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
 
 
 void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)
+_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint first;
@@ -1398,9 +1398,9 @@ invalidate_rb(GLuint key, void *data, void *userData)
 
 
 /**
- * Helper function used by _mesa_RenderbufferStorageEXT() and 
+ * Helper function used by _mesa_RenderbufferStorage() and 
  * _mesa_RenderbufferStorageMultisample().
- * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().
+ * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorage().
  */
 static void
 renderbuffer_storage(GLenum target, GLenum internalFormat,
@@ -1526,8 +1526,8 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
 
 
 /**
- * Helper function for _mesa_GetRenderbufferParameterivEXT() and
- * _mesa_GetFramebufferAttachmentParameterivEXT()
+ * Helper function for _mesa_GetRenderbufferParameteriv() and
+ * _mesa_GetFramebufferAttachmentParameteriv()
  * We have to be careful to respect the base format.  For example, if a
  * renderbuffer/texture was created with internalFormat=GL_RGB but the
  * driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE
@@ -1545,7 +1545,7 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format)
 
 
 void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+_mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
                              GLsizei width, GLsizei height)
 {
    /* GL_ARB_fbo says calling this function is equivalent to calling
@@ -1587,7 +1587,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
 
 
 void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
+_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    struct gl_renderbuffer *rb;
    GET_CURRENT_CONTEXT(ctx);
@@ -1645,7 +1645,7 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
 
 
 GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer)
+_mesa_IsFramebuffer(GLuint framebuffer)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -1705,7 +1705,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 
 
 void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
+_mesa_BindFramebuffer(GLenum target, GLuint framebuffer)
 {
    struct gl_framebuffer *newDrawFb, *newReadFb;
    struct gl_framebuffer *oldDrawFb, *oldReadFb;
@@ -1839,7 +1839,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
 
 
 void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
+_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
    GLint i;
    GET_CURRENT_CONTEXT(ctx);
@@ -1860,12 +1860,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
                if (fb == ctx->DrawBuffer) {
                   /* bind default */
                   ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
+                  _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
                }
                if (fb == ctx->ReadBuffer) {
                   /* bind default */
                   ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
+                  _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0);
                }
             }
             else {
@@ -1873,7 +1873,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
                if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) {
                   /* bind default */
                   ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+                  _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
                }
             }
 
@@ -1893,7 +1893,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
 
 
 void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
+_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint first;
@@ -1924,7 +1924,7 @@ _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
 
 
 GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target)
+_mesa_CheckFramebufferStatus(GLenum target)
 {
    struct gl_framebuffer *buffer;
    GET_CURRENT_CONTEXT(ctx);
@@ -2151,7 +2151,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
 
 
 void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -2184,7 +2184,7 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
 
 
 void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -2230,7 +2230,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
 
 
 void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture,
                               GLint level, GLint zoffset)
 {
@@ -2248,7 +2248,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
 
 
 void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
                                  GLuint texture, GLint level, GLint layer)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -2259,7 +2259,7 @@ _mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
 
 
 void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
                                  GLenum renderbufferTarget,
                                  GLuint renderbuffer)
 {
@@ -2343,7 +2343,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
 
 
 void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
+_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
                                              GLenum pname, GLint *params)
 {
    const struct gl_renderbuffer_attachment *att;
@@ -2575,7 +2575,7 @@ invalid_pname_enum:
 
 
 void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target)
+_mesa_GenerateMipmap(GLenum target)
 {
    struct gl_texture_image *srcImage;
    struct gl_texture_object *texObj;
@@ -2833,7 +2833,7 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb,
  * when the samples must be resolved to a single color.
  */
 void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                          GLbitfield mask, GLenum filter)
 {
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 44d92d42156..9207f59c789 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -124,19 +124,19 @@ extern GLenum
 _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
 
 extern GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer);
+_mesa_IsRenderbuffer(GLuint renderbuffer);
 
 extern void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
+_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer);
 
 extern void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
+_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
 
 extern void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
+_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
 
 extern void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
+_mesa_RenderbufferStorage(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
 
 extern void GLAPIENTRY
@@ -152,56 +152,56 @@ extern void GLAPIENTRY
 _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
 
 extern void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
+_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname,
                                     GLint *params);
 
 extern GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer);
+_mesa_IsFramebuffer(GLuint framebuffer);
 
 extern void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
+_mesa_BindFramebuffer(GLenum target, GLuint framebuffer);
 
 extern void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
+_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
 
 extern void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
+_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers);
 
 extern GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target);
+_mesa_CheckFramebufferStatus(GLenum target);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture,
                               GLint level, GLint zoffset);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
                                  GLuint texture, GLint level, GLint layer);
 
 extern void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
                                  GLenum renderbuffertarget,
                                  GLuint renderbuffer);
 
 extern void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
+_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
                                              GLenum pname, GLint *params);
 
 extern void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target);
+_mesa_GenerateMipmap(GLenum target);
 
 
 extern void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                          GLbitfield mask, GLenum filter);
 
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 39709b80894..e1ebd18569f 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1614,7 +1614,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
 }
 
 void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
+_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params )
 {
    union value v;
    enum value_type type =
@@ -1639,7 +1639,7 @@ _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
 }
 
 void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
+_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
 {
    union value v;
    enum value_type type =
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
index 9422efec565..4daa1aec117 100644
--- a/src/mesa/main/get.h
+++ b/src/mesa/main/get.h
@@ -54,10 +54,10 @@ extern void GLAPIENTRY
 _mesa_GetFixedv(GLenum pname, GLfixed *params);
 
 extern void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params );
+_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params );
 
 extern void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params );
+_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
 
 extern void GLAPIENTRY
 _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params );
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 042ed1cb858..b0a10e9edd8 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -66,7 +66,7 @@ _mesa_ShadeModel( GLenum mode )
  * triangle or line.
  */
 void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode)
+_mesa_ProvokingVertex(GLenum mode)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 2e6a5003ece..e25dbf226ec 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -39,7 +39,7 @@ extern void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode );
 
 extern void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode);
+_mesa_ProvokingVertex(GLenum mode);
 
 
 extern void GLAPIENTRY
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 3c5968c853f..00b8e00b75e 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -489,7 +489,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
 
 
 void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
+_mesa_LoadTransposeMatrixf( const GLfloat *m )
 {
    GLfloat tm[16];
    if (!m) return;
@@ -499,7 +499,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m )
 
 
 void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
+_mesa_LoadTransposeMatrixd( const GLdouble *m )
 {
    GLfloat tm[16];
    if (!m) return;
@@ -509,7 +509,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m )
 
 
 void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m )
+_mesa_MultTransposeMatrixf( const GLfloat *m )
 {
    GLfloat tm[16];
    if (!m) return;
@@ -519,7 +519,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m )
 
 
 void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m )
+_mesa_MultTransposeMatrixd( const GLdouble *m )
 {
    GLfloat tm[16];
    if (!m) return;
diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index 2878cc134b5..185a5c04b1b 100644
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -85,16 +85,16 @@ extern void GLAPIENTRY
 _mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
 
 extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
+_mesa_LoadTransposeMatrixf( const GLfloat *m );
 
 extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
+_mesa_LoadTransposeMatrixd( const GLdouble *m );
 
 extern void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m );
+_mesa_MultTransposeMatrixf( const GLfloat *m );
 
 extern void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m );
+_mesa_MultTransposeMatrixd( const GLdouble *m );
 
 
 extern void 
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 67fdb8c9db9..347e98e4eda 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -34,7 +34,7 @@
  * Called via glSampleCoverageARB
  */
 void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
+_mesa_SampleCoverage(GLclampf value, GLboolean invert)
 {
    GET_CURRENT_CONTEXT(ctx);
 
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
index e86d4092bc9..30726c34cf1 100644
--- a/src/mesa/main/multisample.h
+++ b/src/mesa/main/multisample.h
@@ -31,7 +31,7 @@
 struct gl_context;
 
 extern void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
+_mesa_SampleCoverage(GLclampf value, GLboolean invert);
 
 
 extern void
diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
index 63d1d8e26c0..aee8aef129e 100644
--- a/src/mesa/main/querymatrix.c
+++ b/src/mesa/main/querymatrix.c
@@ -89,7 +89,7 @@ fpclassify(double x)
 
 #endif
 
-GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
 {
     GLfloat matrix[16];
     GLint tmp;
diff --git a/src/mesa/main/querymatrix.h b/src/mesa/main/querymatrix.h
index 37a22e961e6..187b5f48602 100644
--- a/src/mesa/main/querymatrix.h
+++ b/src/mesa/main/querymatrix.h
@@ -34,6 +34,6 @@
  */
 
 extern GLbitfield GLAPIENTRY
-_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
+_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
 
 #endif
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index a22425ab0bd..dbf40d0510a 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
 
 
 void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
+_mesa_GenQueries(GLsizei n, GLuint *ids)
 {
    GLuint first;
    GET_CURRENT_CONTEXT(ctx);
@@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
 
 
 void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
+_mesa_DeleteQueries(GLsizei n, const GLuint *ids)
 {
    GLint i;
    GET_CURRENT_CONTEXT(ctx);
@@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
 
 
 GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id)
+_mesa_IsQuery(GLuint id)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index)
 }
 
 void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id)
+_mesa_BeginQuery(GLenum target, GLuint id)
 {
    _mesa_BeginQueryIndexed(target, 0, id);
 }
 
 void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target)
+_mesa_EndQuery(GLenum target)
 {
    _mesa_EndQueryIndexed(target, 0);
 }
@@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
 }
 
 void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
+_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
    _mesa_GetQueryIndexediv(target, 0, pname, params);
 }
 
 void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
+_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
    struct gl_query_object *q = NULL;
    GET_CURRENT_CONTEXT(ctx);
@@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
 
 
 void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
+_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
    struct gl_query_object *q = NULL;
    GET_CURRENT_CONTEXT(ctx);
@@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
  * New with GL_EXT_timer_query
  */
 void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
+_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params)
 {
    struct gl_query_object *q = NULL;
    GET_CURRENT_CONTEXT(ctx);
@@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
  * New with GL_EXT_timer_query
  */
 void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
+_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params)
 {
    struct gl_query_object *q = NULL;
    GET_CURRENT_CONTEXT(ctx);
@@ -740,20 +740,20 @@ void
 _mesa_init_queryobj_dispatch(const struct gl_context *ctx,
                              struct _glapi_table *disp)
 {
-   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
-   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
-   SET_IsQueryARB(disp, _mesa_IsQueryARB);
-   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
-   SET_EndQueryARB(disp, _mesa_EndQueryARB);
-   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
-   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
+   SET_GenQueries(disp, _mesa_GenQueries);
+   SET_DeleteQueries(disp, _mesa_DeleteQueries);
+   SET_IsQuery(disp, _mesa_IsQuery);
+   SET_BeginQuery(disp, _mesa_BeginQuery);
+   SET_EndQuery(disp, _mesa_EndQuery);
+   SET_GetQueryiv(disp, _mesa_GetQueryiv);
+   SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv);
 
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
+      SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv);
       SET_QueryCounter(disp, _mesa_QueryCounter);
 
-      SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
-      SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
+      SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v);
+      SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v);
 
       SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed);
       SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed);
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index f9e916cda89..78cbfc29455 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -54,33 +54,33 @@ extern void
 _mesa_free_queryobj_data(struct gl_context *ctx);
 
 void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
+_mesa_GenQueries(GLsizei n, GLuint *ids);
 void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
+_mesa_DeleteQueries(GLsizei n, const GLuint *ids);
 GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id);
+_mesa_IsQuery(GLuint id);
 void GLAPIENTRY
 _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id);
 void GLAPIENTRY
 _mesa_EndQueryIndexed(GLenum target, GLuint index);
 void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id);
+_mesa_BeginQuery(GLenum target, GLuint id);
 void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target);
+_mesa_EndQuery(GLenum target);
 void GLAPIENTRY
 _mesa_QueryCounter(GLuint id, GLenum target);
 void GLAPIENTRY
 _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
                         GLint *params);
 void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
+_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params);
 void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
+_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
 void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
+_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
 void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params);
+_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params);
 void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params);
+_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params);
 
 #endif /* QUERYOBJ_H */
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 0ea95b59407..51747acabcc 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -289,49 +289,49 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 
 
 void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
+_mesa_WindowPos2d(GLdouble x, GLdouble y)
 {
    window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
+_mesa_WindowPos2f(GLfloat x, GLfloat y)
 {
    window_pos4f(x, y, 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y)
+_mesa_WindowPos2i(GLint x, GLint y)
 {
    window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y)
+_mesa_WindowPos2s(GLshort x, GLshort y)
 {
    window_pos4f(x, y, 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
+_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
    window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
+_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
    window_pos4f(x, y, z, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
+_mesa_WindowPos3i(GLint x, GLint y, GLint z)
 {
    window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
+_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z)
 {
    window_pos4f(x, y, z, 1.0F);
 }
@@ -361,49 +361,49 @@ _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v)
+_mesa_WindowPos2dv(const GLdouble *v)
 {
    window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v)
+_mesa_WindowPos2fv(const GLfloat *v)
 {
    window_pos4f(v[0], v[1], 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v)
+_mesa_WindowPos2iv(const GLint *v)
 {
    window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v)
+_mesa_WindowPos2sv(const GLshort *v)
 {
    window_pos4f(v[0], v[1], 0.0F, 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v)
+_mesa_WindowPos3dv(const GLdouble *v)
 {
    window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v)
+_mesa_WindowPos3fv(const GLfloat *v)
 {
    window_pos4f(v[0], v[1], v[2], 1.0);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v)
+_mesa_WindowPos3iv(const GLint *v)
 {
    window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
 }
 
 void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v)
+_mesa_WindowPos3sv(const GLshort *v)
 {
    window_pos4f(v[0], v[1], v[2], 1.0F);
 }
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index 90351e86bee..bbd32abd383 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -90,21 +90,21 @@ _mesa_RasterPos4iv(const GLint *v);
 void GLAPIENTRY
 _mesa_RasterPos4sv(const GLshort *v);
 void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
+_mesa_WindowPos2d(GLdouble x, GLdouble y);
 void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
+_mesa_WindowPos2f(GLfloat x, GLfloat y);
 void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y);
+_mesa_WindowPos2i(GLint x, GLint y);
 void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y);
+_mesa_WindowPos2s(GLshort x, GLshort y);
 void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
+_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z);
 void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
+_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z);
 void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
+_mesa_WindowPos3i(GLint x, GLint y, GLint z);
 void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
+_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z);
 void GLAPIENTRY
 _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
 void GLAPIENTRY
@@ -114,21 +114,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
 void GLAPIENTRY
 _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
 void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v);
+_mesa_WindowPos2dv(const GLdouble *v);
 void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v);
+_mesa_WindowPos2fv(const GLfloat *v);
 void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v);
+_mesa_WindowPos2iv(const GLint *v);
 void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v);
+_mesa_WindowPos2sv(const GLshort *v);
 void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v);
+_mesa_WindowPos3dv(const GLdouble *v);
 void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v);
+_mesa_WindowPos3fv(const GLfloat *v);
 void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v);
+_mesa_WindowPos3iv(const GLint *v);
 void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v);
+_mesa_WindowPos3sv(const GLshort *v);
 void GLAPIENTRY
 _mesa_WindowPos4dvMESA(const GLdouble *v);
 void GLAPIENTRY
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
index 02a48ba60a6..27b1b8f5688 100644
--- a/src/mesa/main/shader_query.cpp
+++ b/src/mesa/main/shader_query.cpp
@@ -40,7 +40,7 @@ extern "C" {
 }
 
 void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
+_mesa_BindAttribLocation(GLhandleARB program, GLuint index,
                             const GLcharARB *name)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -77,7 +77,7 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
 }
 
 void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
+_mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
                          GLsizei maxLength, GLsizei * length, GLint * size,
                          GLenum * type, GLcharARB * name)
 {
@@ -132,7 +132,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
 }
 
 GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
+_mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_shader_program *const shProg =
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 9376b0f42ef..2d93e90a2a1 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1001,7 +1001,7 @@ _mesa_AttachShader(GLuint program, GLuint shader)
 
 
 void GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB shaderObj)
+_mesa_CompileShader(GLhandleARB shaderObj)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (MESA_VERBOSE & VERBOSE_API)
@@ -1215,7 +1215,7 @@ _mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
 
 
 void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
+_mesa_GetShaderSource(GLhandleARB shader, GLsizei maxLength,
                          GLsizei *length, GLcharARB *sourceOut)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1248,7 +1248,7 @@ _mesa_IsShader(GLuint name)
 
 
 void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj)
+_mesa_LinkProgram(GLhandleARB programObj)
 {
    GET_CURRENT_CONTEXT(ctx);
    link_program(ctx, programObj);
@@ -1291,7 +1291,7 @@ read_shader(const char *fname)
  * and pass it to _mesa_shader_source().
  */
 void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
+_mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count,
                       const GLcharARB ** string, const GLint * length)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1385,7 +1385,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
 
 
 void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB program)
+_mesa_UseProgram(GLhandleARB program)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_shader_program *shProg;
@@ -1425,7 +1425,7 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
 
 
 void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB program)
+_mesa_ValidateProgram(GLhandleARB program)
 {
    GET_CURRENT_CONTEXT(ctx);
    validate_program(ctx, program);
@@ -1706,12 +1706,12 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
    }
 
    if (ctx->API != API_OPENGLES) {
-      SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
-      SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
-      SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
-      SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
-      SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
-      SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
+      SET_ShaderSource(exec, _mesa_ShaderSource);
+      SET_CompileShader(exec, _mesa_CompileShader);
+      SET_LinkProgram(exec, _mesa_LinkProgram);
+      SET_UseProgram(exec, _mesa_UseProgram);
+      SET_ValidateProgram(exec, _mesa_ValidateProgram);
+      SET_GetShaderSource(exec, _mesa_GetShaderSource);
 
       /* OpenGL 2.0 */
       SET_AttachShader(exec, _mesa_AttachShader);
@@ -1729,9 +1729,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
       SET_IsShader(exec, _mesa_IsShader);
 
       /* GL_ARB_vertex_shader */
-      SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
-      SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
-      SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
+      SET_BindAttribLocation(exec, _mesa_BindAttribLocation);
+      SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib);
+      SET_GetAttribLocation(exec, _mesa_GetAttribLocation);
    }
 
    if (ctx->API == API_OPENGL) {
@@ -1742,10 +1742,10 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
 
    /* GL_EXT_gpu_shader4 / GL 3.0 */
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation);
+      SET_BindFragDataLocation(exec, _mesa_BindFragDataLocation);
    }
    if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
-      SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation);
+      SET_GetFragDataLocation(exec, _mesa_GetFragDataLocation);
    }
 
    /* GL_ARB_ES2_compatibility */
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index d6382e04a76..64798bc2e23 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -64,7 +64,7 @@ extern void GLAPIENTRY
 _mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
 
 extern void  GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB);
+_mesa_CompileShader(GLhandleARB);
 
 extern GLhandleARB GLAPIENTRY
 _mesa_CreateProgramObjectARB(void);
@@ -100,7 +100,7 @@ extern void GLAPIENTRY
 _mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
 
 extern void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
 
 extern GLboolean GLAPIENTRY
 _mesa_IsProgram(GLuint name);
@@ -109,20 +109,20 @@ extern GLboolean GLAPIENTRY
 _mesa_IsShader(GLuint name);
 
 extern void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj);
+_mesa_LinkProgram(GLhandleARB programObj);
 
 extern void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
 
 extern void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB);
+_mesa_UseProgram(GLhandleARB);
 
 extern void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB);
+_mesa_ValidateProgram(GLhandleARB);
 
 
 extern void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);
+_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *);
 
 extern void GLAPIENTRY
 _mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,
@@ -133,11 +133,11 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
                                   GLuint index, const GLchar *name);
 
 extern void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
+_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
                          GLenum *, GLcharARB *);
 
 extern GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);
+_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *);
 
 
 
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index b0475da1a5b..56f0dfb921c 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -894,7 +894,7 @@ const struct function gl_core_functions_possible[] = {
 };
 
 const struct function gles11_functions_possible[] = {
-   { "glActiveTexture", 11, _gloffset_ActiveTextureARB },
+   { "glActiveTexture", 11, _gloffset_ActiveTexture },
    { "glAlphaFunc", 11, _gloffset_AlphaFunc },
    { "glAlphaFuncx", 11, -1 },
    { "glBindBuffer", 11, -1 },
@@ -914,7 +914,7 @@ const struct function gles11_functions_possible[] = {
    { "glClearDepthf", 11, -1 },
    { "glClearDepthx", 11, -1 },
    { "glClearStencil", 11, _gloffset_ClearStencil },
-   { "glClientActiveTexture", 11, _gloffset_ClientActiveTextureARB },
+   { "glClientActiveTexture", 11, _gloffset_ClientActiveTexture },
    { "glClipPlanef", 11, -1 },
    { "glClipPlanex", 11, -1 },
    { "glColor4f", 11, _gloffset_Color4f },
@@ -1088,7 +1088,7 @@ const struct function gles11_functions_possible[] = {
 };
 
 const struct function gles2_functions_possible[] = {
-   { "glActiveTexture", 20, _gloffset_ActiveTextureARB },
+   { "glActiveTexture", 20, _gloffset_ActiveTexture },
    { "glAttachShader", 20, -1 },
    { "glBindAttribLocation", 20, -1 },
    { "glBindBuffer", 20, -1 },
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 554c68b7186..2ccdcebd9f9 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -959,7 +959,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
 }
 
 void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
+_mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
    _mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img);
 }
diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h
index cd8e76e7a3e..c9277fc91b7 100644
--- a/src/mesa/main/texgetimage.h
+++ b/src/mesa/main/texgetimage.h
@@ -54,7 +54,7 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format,
                        GLenum type, GLsizei bufSize, GLvoid *pixels );
 
 extern void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
+_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img);
 
 extern void GLAPIENTRY
 _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 0f28009b0cd..678833ec5ee 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3532,7 +3532,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage1D(GLenum target, GLint level,
                               GLenum internalFormat, GLsizei width,
                               GLint border, GLsizei imageSize,
                               const GLvoid *data)
@@ -3544,7 +3544,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage2D(GLenum target, GLint level,
                               GLenum internalFormat, GLsizei width,
                               GLsizei height, GLint border, GLsizei imageSize,
                               const GLvoid *data)
@@ -3556,7 +3556,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage3D(GLenum target, GLint level,
                               GLenum internalFormat, GLsizei width,
                               GLsizei height, GLsizei depth, GLint border,
                               GLsizei imageSize, const GLvoid *data)
@@ -3611,7 +3611,7 @@ compressed_tex_sub_image(GLuint dims, GLenum target, GLint level,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
                                  GLsizei width, GLenum format,
                                  GLsizei imageSize, const GLvoid *data)
 {
@@ -3621,7 +3621,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
                                  GLint yoffset, GLsizei width, GLsizei height,
                                  GLenum format, GLsizei imageSize,
                                  const GLvoid *data)
@@ -3632,7 +3632,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
 
 
 void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
                                  GLint yoffset, GLint zoffset, GLsizei width,
                                  GLsizei height, GLsizei depth, GLenum format,
                                  GLsizei imageSize, const GLvoid *data)
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index e1b15d2520d..ca4b8c86632 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -248,41 +248,41 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
 
 
 extern void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage1D(GLenum target, GLint level,
                               GLenum internalformat, GLsizei width,
                               GLint border, GLsizei imageSize,
                               const GLvoid *data);
 
 extern void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage2D(GLenum target, GLint level,
                               GLenum internalformat, GLsizei width,
                               GLsizei height, GLint border, GLsizei imageSize,
                               const GLvoid *data);
 
 extern void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage3D(GLenum target, GLint level,
                               GLenum internalformat, GLsizei width,
                               GLsizei height, GLsizei depth, GLint border,
                               GLsizei imageSize, const GLvoid *data);
 
 #ifdef VMS
-#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
-#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
-#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
+#define _mesa_CompressedTexSubImage1D _mesa_CompressedTexSubImage1DAR
+#define _mesa_CompressedTexSubImage2D _mesa_CompressedTexSubImage2DAR
+#define _mesa_CompressedTexSubImage3D _mesa_CompressedTexSubImage3DAR
 #endif
 extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
                                  GLsizei width, GLenum format,
                                  GLsizei imageSize, const GLvoid *data);
 
 extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
                                  GLint yoffset, GLsizei width, GLsizei height,
                                  GLenum format, GLsizei imageSize,
                                  const GLvoid *data);
 
 extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
                                  GLint yoffset, GLint zoffset, GLsizei width,
                                  GLsizei height, GLsizei depth, GLenum format,
                                  GLsizei imageSize, const GLvoid *data);
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 1f765086b6d..8e9bbf6a180 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -286,7 +286,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 
 /* GL_ARB_multitexture */
 void GLAPIENTRY
-_mesa_ActiveTextureARB(GLenum texture)
+_mesa_ActiveTexture(GLenum texture)
 {
    const GLuint texUnit = texture - GL_TEXTURE0;
    GLuint k;
@@ -325,7 +325,7 @@ _mesa_ActiveTextureARB(GLenum texture)
 
 /* GL_ARB_multitexture */
 void GLAPIENTRY
-_mesa_ClientActiveTextureARB(GLenum texture)
+_mesa_ClientActiveTexture(GLenum texture)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint texUnit = texture - GL_TEXTURE0;
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 7dc6dc6a2cd..7abf9101ebf 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
 /*@{*/
 
 extern void GLAPIENTRY
-_mesa_ActiveTextureARB( GLenum target );
+_mesa_ActiveTexture( GLenum target );
 
 extern void GLAPIENTRY
-_mesa_ClientActiveTextureARB( GLenum target );
+_mesa_ClientActiveTexture( GLenum target );
 
 /*@}*/
 
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index bddb8f95e14..c71577c6ed1 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -38,7 +38,7 @@
 
 
 extern "C" void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
+_mesa_GetActiveUniform(GLhandleARB program, GLuint index,
                           GLsizei maxLength, GLsizei *length, GLint *size,
                           GLenum *type, GLcharARB *nameOut)
 {
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 2b7a564f0c5..3f156bf103f 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -128,14 +128,14 @@ _mesa_uniform_detach_all_driver_storage(struct gl_uniform_storage *uni)
 }
 
 void GLAPIENTRY
-_mesa_Uniform1fARB(GLint location, GLfloat v0)
+_mesa_Uniform1f(GLint location, GLfloat v0)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT);
 }
 
 void GLAPIENTRY
-_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
+_mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLfloat v[2];
@@ -145,7 +145,7 @@ _mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
 }
 
 void GLAPIENTRY
-_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
+_mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLfloat v[3];
@@ -156,7 +156,7 @@ _mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 }
 
 void GLAPIENTRY
-_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
+_mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
                    GLfloat v3)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -169,14 +169,14 @@ _mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
 }
 
 void GLAPIENTRY
-_mesa_Uniform1iARB(GLint location, GLint v0)
+_mesa_Uniform1i(GLint location, GLint v0)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT);
 }
 
 void GLAPIENTRY
-_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
+_mesa_Uniform2i(GLint location, GLint v0, GLint v1)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint v[2];
@@ -186,7 +186,7 @@ _mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
 }
 
 void GLAPIENTRY
-_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
+_mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint v[3];
@@ -197,7 +197,7 @@ _mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
 }
 
 void GLAPIENTRY
-_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
+_mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint v[4];
@@ -209,56 +209,56 @@ _mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 }
 
 void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT);
 }
 
 void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2);
 }
 
 void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3);
 }
 
 void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4);
 }
 
 void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT);
 }
 
 void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2);
 }
 
 void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3);
 }
 
 void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value)
 {
    GET_CURRENT_CONTEXT(ctx);
    _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4);
@@ -337,7 +337,7 @@ _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
 
 
 void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -346,7 +346,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
 }
 
 void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -355,7 +355,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
 }
 
 void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
                           const GLfloat * value)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -431,7 +431,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location,
 }
 
 void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)
+_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params)
 {
    _mesa_GetnUniformfvARB(program, location, INT_MAX, params);
 }
@@ -446,7 +446,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location,
 }
 
 void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)
+_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params)
 {
    _mesa_GetnUniformivARB(program, location, INT_MAX, params);
 }
@@ -495,7 +495,7 @@ _mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params)
 
 
 GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
+_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
 {
    struct gl_shader_program *shProg;
    GLuint index, offset;
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index 076bde3c85e..287d7106bb6 100644
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -39,37 +39,37 @@ struct gl_program;
 struct _glapi_table;
 
 void GLAPIENTRY
-_mesa_Uniform1fARB(GLint, GLfloat);
+_mesa_Uniform1f(GLint, GLfloat);
 void GLAPIENTRY
-_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
+_mesa_Uniform2f(GLint, GLfloat, GLfloat);
 void GLAPIENTRY
-_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
+_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat);
 void GLAPIENTRY
-_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
 void GLAPIENTRY
-_mesa_Uniform1iARB(GLint, GLint);
+_mesa_Uniform1i(GLint, GLint);
 void GLAPIENTRY
-_mesa_Uniform2iARB(GLint, GLint, GLint);
+_mesa_Uniform2i(GLint, GLint, GLint);
 void GLAPIENTRY
-_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
+_mesa_Uniform3i(GLint, GLint, GLint, GLint);
 void GLAPIENTRY
-_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
+_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint);
 void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *);
 void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *);
 void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *);
 void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *);
 void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform1iv(GLint, GLsizei, const GLint *);
 void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform2iv(GLint, GLsizei, const GLint *);
 void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform3iv(GLint, GLsizei, const GLint *);
 void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform4iv(GLint, GLsizei, const GLint *);
 void GLAPIENTRY
 _mesa_Uniform1ui(GLint location, GLuint v0);
 void GLAPIENTRY
@@ -87,11 +87,11 @@ _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
 void GLAPIENTRY
 _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
 void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *);
 void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *);
 void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *);
 void GLAPIENTRY
 _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
                          const GLfloat *value);
@@ -113,7 +113,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
 void GLAPIENTRY
 _mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *);
 void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
+_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *);
 void GLAPIENTRY
 _mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *);
 void GLAPIENTRY
@@ -127,7 +127,7 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
 void GLAPIENTRY
 _mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *);
 GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
+_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *);
 GLuint GLAPIENTRY
 _mesa_GetUniformBlockIndex(GLuint program,
 			   const GLchar *uniformBlockName);
@@ -156,7 +156,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex,
 			   GLsizei bufSize, GLsizei *length,
 			   GLchar *uniformName);
 void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
+_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *,
                           GLint *, GLenum *, GLcharARB *);
 void GLAPIENTRY
 _mesa_GetActiveUniformsiv(GLuint program,
@@ -165,7 +165,7 @@ _mesa_GetActiveUniformsiv(GLuint program,
 			  GLenum pname,
 			  GLint *params);
 void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
+_mesa_GetUniformiv(GLhandleARB, GLint, GLint *);
 
 unsigned
 _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 3974787b4fa..7a5a5c5debc 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -330,7 +330,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 
 
 void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
+_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT);
    GET_CURRENT_CONTEXT(ctx);
@@ -357,7 +357,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
 
 
 void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+_mesa_SecondaryColorPointer(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr)
 {
    const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
@@ -413,7 +413,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
 
 
 void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
+_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
    const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT);
    GET_CURRENT_CONTEXT(ctx);
@@ -437,7 +437,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
  * (position, normal, color, fog, texcoord, etc).
  */
 void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
                              GLboolean normalized,
                              GLsizei stride, const GLvoid *ptr)
 {
@@ -493,7 +493,7 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
 
 
 void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index)
+_mesa_EnableVertexAttribArray(GLuint index)
 {
    struct gl_array_object *arrayObj;
    GET_CURRENT_CONTEXT(ctx);
@@ -520,7 +520,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index)
 
 
 void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index)
+_mesa_DisableVertexAttribArray(GLuint index)
 {
    struct gl_array_object *arrayObj;
    GET_CURRENT_CONTEXT(ctx);
@@ -630,7 +630,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function)
 }
 
 void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
+_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -649,7 +649,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
 
 
 void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
+_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -671,7 +671,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
 
 
 void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
+_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -736,7 +736,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 
 
 void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
+_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1039,7 +1039,7 @@ _mesa_UnlockArraysEXT( void )
 
 /* GL_EXT_multi_draw_arrays */
 void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
                           const GLsizei *count, GLsizei primcount )
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index b54e2f7df82..904fa1bea8f 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -127,20 +127,20 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
 
 
 extern void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
+_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
 
 
 extern void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+_mesa_SecondaryColorPointer(GLint size, GLenum type,
 			       GLsizei stride, const GLvoid *ptr);
 
 
 extern void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr);
 
 
 extern void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
                              GLboolean normalized, GLsizei stride,
                              const GLvoid *pointer);
 
@@ -150,23 +150,23 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
 
 
 extern void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index);
+_mesa_EnableVertexAttribArray(GLuint index);
 
 
 extern void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index);
+_mesa_DisableVertexAttribArray(GLuint index);
 
 
 extern void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
+_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);
 
 
 extern void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
+_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
 
 
 extern void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
+_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
 
 
 extern void GLAPIENTRY
@@ -178,7 +178,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
 
 
 extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
+_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer);
 
 
 extern void GLAPIENTRY
@@ -186,7 +186,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
 
 
 extern void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
                           const GLsizei *count, GLsizei primcount );
 
 extern void GLAPIENTRY
author	Paul Berry <[email protected]>	2012-11-06 08:57:59 -0800
committer	Paul Berry <[email protected]>	2012-11-12 10:53:57 -0800
commit	1a1db1746db82efc7f0643508886dfc78a15eb71 (patch)
tree	7f5c19176974df05a9d2e54fe20fe2bb6d346bfa /src/mesa/main
parent	7708a864648aecd8aafb484ec7db18c2aba9e957 (diff)