glapi: Annotate XML with function name suffix anomalies.

When the XML lists one or more GL api functions as aliases for another
GL function, the mesa function that implements the functionality is
usually named after the canonical version of the function (the one
that is the target of the aliases).  For example, FogCoordd is listed
as an alias of FogCoorddEXT, and the Mesa function implementing the
functionality is called loopback_FogCoorddEXT.

However, there are exceptions.  For example, Enablei is listed as an
alias of EnableIndexedEXT, but the Mesa function implementing the
functionality is called _mesa_EnableIndexed.

To account for these anomalies, this patch annotates the XML with
"mesa_name" attributes, which describe how to adjust the function name
to find the corresponding Mesa function.

For example:

  <function name="EnableIndexedEXT" mesa_name="-EXT">...</function>
  <function name="IsProgramNV" mesa_name="-NV+ARB">...</function>

means that EnableIndexedEXT is implemented by a Mesa function called
_mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function
called _mesa_IsProgramARB.

Future patches will use this annotation when code generating
_mesa_create_exec_table(), to determine the name of the Mesa function
that should be stored in each dispatch table entry.

Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>

14 files changed, 191 insertions, 147 deletions

diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
index 0b6947cc5f3..c08017aa552 100644
--- a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
+++ b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
@@ -8,24 +8,25 @@
 
 <category name="GL_ARB_draw_buffers_blend" number="69">
 
-    <function name="BlendEquationiARB" offset="assign">
+    <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB">
         <param name="buf" type="GLuint"/>
         <param name="mode" type="GLenum"/>
     </function>
 
-    <function name="BlendEquationSeparateiARB" offset="assign">
+    <function name="BlendEquationSeparateiARB" offset="assign"
+              mesa_name="-ARB">
         <param name="buf" type="GLuint"/>
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
     </function>
 
-    <function name="BlendFunciARB" offset="assign">
+    <function name="BlendFunciARB" offset="assign" mesa_name="-ARB">
         <param name="buf" type="GLuint"/>
         <param name="src" type="GLenum"/>
         <param name="dst" type="GLenum"/>
     </function>
 
-    <function name="BlendFuncSeparateiARB" offset="assign">
+    <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB">
         <param name="buf" type="GLuint"/>
         <param name="srcRGB" type="GLenum"/>
         <param name="dstRGB" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/src/mapi/glapi/gen/ARB_instanced_arrays.xml
index 822f5437494..9a30b0c9e3e 100644
--- a/src/mapi/glapi/gen/ARB_instanced_arrays.xml
+++ b/src/mapi/glapi/gen/ARB_instanced_arrays.xml
@@ -10,7 +10,7 @@
 
   <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/>
 
-  <function name="VertexAttribDivisorARB" offset="assign">
+  <function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
diff --git a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml
index 57680f5535e..8884591cad6 100644
--- a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_texture_buffer_object.xml
@@ -11,7 +11,7 @@
     <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB"  value="0x8C2D"/>
     <enum name="TEXTURE_BUFFER_FORMAT_ARB"              value="0x8C2E"/>
 
-    <function name="TexBufferARB" offset="assign">
+    <function name="TexBufferARB" offset="assign" mesa_name="-ARB">
         <param name="target" type="GLenum"/>
         <param name="internalFormat" type="GLenum"/>
         <param name="buffer" type="GLuint"/>
diff --git a/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/src/mapi/glapi/gen/EXT_draw_buffers2.xml
index efbe61f74ed..affd55a5f5e 100644
--- a/src/mapi/glapi/gen/EXT_draw_buffers2.xml
+++ b/src/mapi/glapi/gen/EXT_draw_buffers2.xml
@@ -8,7 +8,7 @@
 
 <category name="GL_EXT_draw_buffers2" number="340">
 
-    <function name="ColorMaskIndexedEXT" offset="assign">
+    <function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT">
 	<param name="buf" type="GLuint"/>
 	<param name="r" type="GLboolean"/>
 	<param name="g" type="GLboolean"/>
@@ -16,29 +16,29 @@
 	<param name="a" type="GLboolean"/>
     </function>
 
-    <function name="GetBooleanIndexedvEXT" offset="assign">
+    <function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT">
         <param name="value" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<param name="data" type="GLboolean *"/>
     </function>
 
-    <function name="GetIntegerIndexedvEXT" offset="assign">
+    <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT">
         <param name="value" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<param name="data" type="GLint *"/>
     </function>
 
-    <function name="EnableIndexedEXT" offset="assign">
+    <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
     </function>
 
-    <function name="DisableIndexedEXT" offset="assign">
+    <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
     </function>
 
-    <function name ="IsEnabledIndexedEXT" offset="assign">
+    <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<return type="GLboolean"/>
diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index 990027d0d10..b008f2e655c 100644
--- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -96,7 +96,8 @@
         <param name="w" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *"/>
     </function>
@@ -116,7 +117,8 @@
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *"/>
     </function>
@@ -136,27 +138,31 @@
         <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="VertexAttribI4svEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI4svEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *"/>
     </function>
 
-    <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback">
+    <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback"
+              mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLushort *"/>
     </function>
 
-    <function name="VertexAttribIPointerEXT" offset="assign">
+    <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
@@ -164,37 +170,37 @@
         <param name="pointer" type="const GLvoid *"/>
     </function>
 
-    <function name="GetVertexAttribIivEXT" offset="assign">
+    <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetVertexAttribIuivEXT" offset="assign">
+    <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint *"/>
     </function>
 
-    <function name="Uniform1uiEXT" offset="assign">
+    <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
     </function>
 
-    <function name="Uniform2uiEXT" offset="assign">
+    <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
     </function>
 
-    <function name="Uniform3uiEXT" offset="assign">
+    <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
         <param name="z" type="GLuint"/>
     </function>
 
-    <function name="Uniform4uiEXT" offset="assign">
+    <function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
@@ -202,43 +208,43 @@
         <param name="w" type="GLuint"/>
     </function>
 
-    <function name="Uniform1uivEXT" offset="assign">
+    <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform2uivEXT" offset="assign">
+    <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform3uivEXT" offset="assign">
+    <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform4uivEXT" offset="assign">
+    <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="GetUniformuivEXT" offset="assign">
+    <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLuint *"/>
     </function>
 
-    <function name="BindFragDataLocationEXT" offset="assign">
+    <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT">
         <param name="program" type="GLuint"/>
         <param name="colorNumber" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
     </function>
 
-    <function name="GetFragDataLocationEXT" offset="assign">
+    <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT">
 	<return type="GLint"/>
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
diff --git a/src/mapi/glapi/gen/EXT_texture_integer.xml b/src/mapi/glapi/gen/EXT_texture_integer.xml
index 7e5a8cbebe1..dac3999640a 100644
--- a/src/mapi/glapi/gen/EXT_texture_integer.xml
+++ b/src/mapi/glapi/gen/EXT_texture_integer.xml
@@ -69,25 +69,25 @@
         <param name="a" type="GLuint"/>
     </function>
 
-    <function name="TexParameterIivEXT" offset="assign">
+    <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="TexParameterIuivEXT" offset="assign">
+    <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="const GLuint *"/>
     </function>
 
-    <function name="GetTexParameterIivEXT" offset="assign">
+    <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetTexParameterIuivEXT" offset="assign">
+    <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="GLuint *"/>
diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index c9b1c532151..e9b27582a22 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -24,7 +24,7 @@
   <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT"             value="0x8C7F"/>
   <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT"      value="0x8C76"/>
 
-  <function name="BindBufferRangeEXT" offset="assign">
+  <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
@@ -39,27 +39,29 @@
     <param name="offset" type="GLintptr"/>
   </function>
 
-  <function name="BindBufferBaseEXT" offset="assign">
+  <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="BeginTransformFeedbackEXT" offset="assign">
+  <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndTransformFeedbackEXT" offset="assign">
+  <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
   </function>
 
-  <function name="TransformFeedbackVaryingsEXT" offset="assign">
+  <function name="TransformFeedbackVaryingsEXT" offset="assign"
+            mesa_name="-EXT">
     <param name="program" type="GLuint"/>
     <param name="count" type="GLsizei"/>
     <param name="varyings" type="const char **"/>
     <param name="bufferMode" type="GLenum"/>
   </function>
 
-  <function name="GetTransformFeedbackVaryingEXT" offset="assign">
+  <function name="GetTransformFeedbackVaryingEXT" offset="assign"
+            mesa_name="-EXT">
     <param name="program" type="GLuint"/>
     <param name="index" type="GLuint"/>
     <param name="bufSize" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mapi/glapi/gen/NV_conditional_render.xml
index 8bb31dd1fc9..8bb5c22cad2 100644
--- a/src/mapi/glapi/gen/NV_conditional_render.xml
+++ b/src/mapi/glapi/gen/NV_conditional_render.xml
@@ -13,12 +13,12 @@
     <enum name="QUERY_BY_REGION_WAIT_NV"     value="0x8E15"/>
     <enum name="QUERY_BY_REGION_NO_WAIT_NV"  value="0x8E16"/>
 
-    <function name="BeginConditionalRenderNV" offset="assign">
+    <function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV">
 	<param name="query" type="GLuint"/>
 	<param name="mode" type="GLenum"/>
     </function>
 
-    <function name="EndConditionalRenderNV" offset="assign">
+    <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV">
     </function>
 
 </category>
diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml
index ba71c5c8e2d..d19fc8cf1b5 100644
--- a/src/mapi/glapi/gen/NV_primitive_restart.xml
+++ b/src/mapi/glapi/gen/NV_primitive_restart.xml
@@ -15,7 +15,7 @@
               exec="dynamic">
     </function>
 
-    <function name="PrimitiveRestartIndexNV" offset="assign">
+    <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV">
 	<param name="index" type="GLuint"/>
     </function>
 
diff --git a/src/mapi/glapi/gen/OES_fixed_point.xml b/src/mapi/glapi/gen/OES_fixed_point.xml
index 92e29b19acb..ad775728ff7 100644
--- a/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -14,13 +14,13 @@
 
     <!-- OpenGL ES 1.0 -->
     <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
     <function name="ClearColorxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
@@ -28,12 +28,12 @@
     </function>
 
     <function name="ClearDepthxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="depth" type="GLclampx"/>
     </function>
 
     <function name="Color4xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
@@ -41,25 +41,25 @@
     </function>
 
     <function name="DepthRangexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
     <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"
-              exec="es">
+              exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="FogxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="FrustumxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -69,62 +69,62 @@
     </function>
 
     <function name="LightModelxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="LightModelxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="LightxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="LightxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="LineWidthxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="width" type="GLfixed"/>
     </function>
 
     <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
     <function name="MaterialxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="MaterialxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="MultMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
     <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -133,14 +133,14 @@
     </function>
 
     <function name="Normal3xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
     <function name="OrthoxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -150,18 +150,18 @@
     </function>
 
     <function name="PointSizexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="size" type="GLfixed"/>
     </function>
 
     <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
     <function name="RotatexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
@@ -169,41 +169,41 @@
     </function>
 
     <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
     <function name="ScalexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <function name="TexEnvxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="TexEnvxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <function name="TexParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="TranslatexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
@@ -211,65 +211,65 @@
 
     <!-- OpenGL ES 1.1 -->
     <function name="ClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
     <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false">
+              es1="1.0" exec="es" desktop="false" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
     <function name="GetFixedvOES" offset="assign" static_dispatch="false"
-              es1="1.0">
+              es1="1.0" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetLightxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="GetTexParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0" exec="es">
+              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="PointParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
     <function name="PointParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0" exec="es">
+              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
     <function name="TexParameterxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
diff --git a/src/mapi/glapi/gen/OES_single_precision.xml b/src/mapi/glapi/gen/OES_single_precision.xml
index 935aea81bf8..8a6c2719451 100644
--- a/src/mapi/glapi/gen/OES_single_precision.xml
+++ b/src/mapi/glapi/gen/OES_single_precision.xml
@@ -12,7 +12,7 @@
     </function>
 
     <function name="ClipPlanefOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfloat *" count="4"/>
     </function>
@@ -24,13 +24,13 @@
     </function>
 
     <function name="GetClipPlanefOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false">
+              es1="1.0" exec="es" desktop="false" mesa_name="-OES">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfloat *" output="true" count="4"/>
     </function>
 
     <function name="FrustumfOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -40,7 +40,7 @@
     </function>
 
     <function name="OrthofOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es">
+              es1="1.0" exec="es" mesa_name="-OES">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index a78cec36790..c0bbbfae1be 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -73,7 +73,7 @@
     <enum name="TEXTURE_CROP_RECT_OES"                    value="0x8B9D"/>
 
     <function name="DrawTexiOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
@@ -82,12 +82,12 @@
     </function>
 
     <function name="DrawTexivOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="coords" type="const GLint *" count="5"/>
     </function>
 
     <function name="DrawTexfOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
@@ -96,12 +96,12 @@
     </function>
 
     <function name="DrawTexfvOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="coords" type="const GLfloat *" count="5"/>
     </function>
 
     <function name="DrawTexsOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
@@ -110,7 +110,7 @@
     </function>
 
     <function name="DrawTexsvOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false">
+              es1="1.0" desktop="false" mesa_name="-OES">
         <param name="coords" type="const GLshort *" count="5"/>
     </function>
 
@@ -343,7 +343,8 @@
     <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES"	  value="0x8B9F"/>
 
     <function name="PointSizePointerOES" offset="assign"
-              static_dispatch="false" es1="1.0" desktop="false">
+              static_dispatch="false" es1="1.0" desktop="false"
+              mesa_name="-OES">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mapi/glapi/gen/gl_API.dtd
index ab321fad0f8..066d5da522d 100644
--- a/src/mapi/glapi/gen/gl_API.dtd
+++ b/src/mapi/glapi/gen/gl_API.dtd
@@ -40,7 +40,8 @@
                    es2                 CDATA   "none"
                    deprecated          CDATA   "none"
                    exec                NMTOKEN #IMPLIED
-                   desktop             (true | false) "true">
+                   desktop             (true | false) "true"
+                   mesa_name           CDATA   #IMPLIED>
 <!ATTLIST size     name                NMTOKEN #REQUIRED
                    count               NMTOKEN #IMPLIED
                    mode                (get | set) "set">
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 9cdfc838d3b..01d2a9cd2d4 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1164,25 +1164,27 @@
     </function>
 
     <function name="Color3b" offset="9" vectorequiv="Color3bv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback">
+    <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="6"/>
     </function>
 
     <function name="Color3d" offset="11" vectorequiv="Color3dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback">
+    <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="7"/>
     </function>
@@ -1200,87 +1202,94 @@
     </function>
 
     <function name="Color3i" offset="15" vectorequiv="Color3iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback">
+    <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="9"/>
     </function>
 
     <function name="Color3s" offset="17" vectorequiv="Color3sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback">
+    <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="10"/>
     </function>
 
     <function name="Color3ub" offset="19" vectorequiv="Color3ubv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback">
+    <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLubyte *" count="3"/>
         <glx rop="11"/>
     </function>
 
     <function name="Color3ui" offset="21" vectorequiv="Color3uiv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback">
+    <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLuint *" count="3"/>
         <glx rop="12"/>
     </function>
 
     <function name="Color3us" offset="23" vectorequiv="Color3usv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback">
+    <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLushort *" count="3"/>
         <glx rop="13"/>
     </function>
 
     <function name="Color4b" offset="25" vectorequiv="Color4bv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
         <param name="alpha" type="GLbyte"/>
     </function>
 
-    <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback">
+    <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLbyte *" count="4"/>
         <glx rop="14"/>
     </function>
 
     <function name="Color4d" offset="27" vectorequiv="Color4dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
         <param name="alpha" type="GLdouble"/>
     </function>
 
-    <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback">
+    <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="15"/>
     </function>
@@ -1299,66 +1308,71 @@
     </function>
 
     <function name="Color4i" offset="31" vectorequiv="Color4iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
         <param name="alpha" type="GLint"/>
     </function>
 
-    <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback">
+    <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="17"/>
     </function>
 
     <function name="Color4s" offset="33" vectorequiv="Color4sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
         <param name="alpha" type="GLshort"/>
     </function>
 
-    <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback">
+    <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="18"/>
     </function>
 
     <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
         <param name="alpha" type="GLubyte"/>
     </function>
 
-    <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback">
+    <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="19"/>
     </function>
 
     <function name="Color4ui" offset="37" vectorequiv="Color4uiv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
         <param name="alpha" type="GLuint"/>
     </function>
 
-    <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback">
+    <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLuint *" count="4"/>
         <glx rop="20"/>
     </function>
 
     <function name="Color4us" offset="39" vectorequiv="Color4usv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1" exec="loopback" mesa_name="+_f">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
         <param name="alpha" type="GLushort"/>
     </function>
 
-    <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback">
+    <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="21"/>
     </function>
@@ -9300,13 +9314,13 @@
         <size name="PointParameterfvEXT"/>
     </enum>
 
-    <function name="PointParameterfEXT" offset="assign">
+    <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="2065"/>
     </function>
 
-    <function name="PointParameterfvEXT" offset="assign">
+    <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="2066"/>
@@ -10015,25 +10029,29 @@
 
 <category name="GL_EXT_secondary_color" number="145">
     <function name="SecondaryColor3bEXT" offset="assign"
-              vectorequiv="SecondaryColor3bvEXT" exec="loopback">
+              vectorequiv="SecondaryColor3bvEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="4126"/>
     </function>
 
     <function name="SecondaryColor3dEXT" offset="assign"
-              vectorequiv="SecondaryColor3dvEXT" exec="loopback">
+              vectorequiv="SecondaryColor3dvEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="4130"/>
     </function>
@@ -10050,61 +10068,71 @@
     </function>
 
     <function name="SecondaryColor3iEXT" offset="assign"
-              vectorequiv="SecondaryColor3ivEXT" exec="loopback">
+              vectorequiv="SecondaryColor3ivEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="4128"/>
     </function>
 
     <function name="SecondaryColor3sEXT" offset="assign"
-              vectorequiv="SecondaryColor3svEXT" exec="loopback">
+              vectorequiv="SecondaryColor3svEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="SecondaryColor3svEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3svEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="4127"/>
     </function>
 
     <function name="SecondaryColor3ubEXT" offset="assign"
-              vectorequiv="SecondaryColor3ubvEXT" exec="loopback">
+              vectorequiv="SecondaryColor3ubvEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLubyte *" count="3"/>
         <glx rop="4131"/>
     </function>
 
     <function name="SecondaryColor3uiEXT" offset="assign"
-              vectorequiv="SecondaryColor3uivEXT" exec="loopback">
+              vectorequiv="SecondaryColor3uivEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLuint *" count="3"/>
         <glx rop="4133"/>
     </function>
 
     <function name="SecondaryColor3usEXT" offset="assign"
-              vectorequiv="SecondaryColor3usvEXT" exec="loopback">
+              vectorequiv="SecondaryColor3usvEXT" exec="loopback"
+              mesa_name="+_f">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback">
+    <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback"
+              mesa_name="+_f">
         <param name="v" type="const GLushort *" count="3"/>
         <glx rop="4132"/>
     </function>
@@ -11581,13 +11609,15 @@
         <glx vendorpriv="1293"/>
     </function>
 
-    <function name="BindProgramNV" offset="assign" deprecated="3.1">
+    <function name="BindProgramNV" offset="assign" deprecated="3.1"
+              mesa_name="-NV">
         <param name="target" type="GLenum"/>
         <param name="program" type="GLuint"/>
         <glx rop="4180"/>
     </function>
 
-    <function name="DeleteProgramsNV" offset="assign" deprecated="3.1">
+    <function name="DeleteProgramsNV" offset="assign" deprecated="3.1"
+              mesa_name="-NV">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="programs" type="const GLuint *" count="n"/>
         <glx vendorpriv="1294"/>
@@ -11601,7 +11631,8 @@
         <glx rop="4181"/>
     </function>
 
-    <function name="GenProgramsNV" offset="assign" deprecated="3.1">
+    <function name="GenProgramsNV" offset="assign" deprecated="3.1"
+              mesa_name="-NV">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="programs" type="GLuint *" output="true" count="n"/>
         <glx vendorpriv="1295" always_array="true"/>
@@ -11680,14 +11711,16 @@
         <glx vendorpriv="1303"/>
     </function>
 
-    <function name="GetVertexAttribPointervNV" offset="assign">
+    <function name="GetVertexAttribPointervNV" offset="assign"
+              mesa_name="-NV+ARB">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="pointer" type="GLvoid **" output="true"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="IsProgramNV" offset="assign" deprecated="3.1">
+    <function name="IsProgramNV" offset="assign" deprecated="3.1"
+              mesa_name="-NV+ARB">
         <param name="program" type="GLuint"/>
         <return type="GLboolean"/>
         <glx vendorpriv="1304"/>
@@ -12465,13 +12498,13 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="PointParameteriNV" offset="assign">
+    <function name="PointParameteriNV" offset="assign" mesa_name="-NV">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="4221"/>
     </function>
 
-    <function name="PointParameterivNV" offset="assign">
+    <function name="PointParameterivNV" offset="assign" mesa_name="-NV">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="4222"/>