From b3e1e62c45f525cdd332073aaa34d8452cb23374 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 19 Nov 2012 10:47:23 +0100
Subject: git update 19 nov 2012

fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
---
 .../mapi/glapi/gen/APPLE_vertex_array_object.xml   |    6 +-
 .../src/mapi/glapi/gen/ARB_color_buffer_float.xml  |    3 +-
 mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml    |    9 +-
 .../src/mapi/glapi/gen/ARB_draw_buffers_blend.xml  |    9 +-
 .../src/mapi/glapi/gen/ARB_framebuffer_object.xml  |   71 +-
 .../src/mapi/glapi/gen/ARB_geometry_shader4.xml    |    2 +-
 .../src/mapi/glapi/gen/ARB_instanced_arrays.xml    |    2 +-
 .../mapi/glapi/gen/ARB_texture_buffer_object.xml   |    2 +-
 .../src/mapi/glapi/gen/ARB_vertex_array_object.xml |    6 +-
 mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml   |   12 +-
 .../src/mapi/glapi/gen/EXT_framebuffer_object.xml  |   84 +-
 mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml     |   46 +-
 .../src/mapi/glapi/gen/EXT_provoking_vertex.xml    |    4 +-
 mesalib/src/mapi/glapi/gen/EXT_texture_array.xml   |    5 +-
 mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml |    8 +-
 .../src/mapi/glapi/gen/EXT_transform_feedback.xml  |   14 +-
 mesalib/src/mapi/glapi/gen/GL3x.xml                |   86 +-
 .../src/mapi/glapi/gen/NV_conditional_render.xml   |    4 +-
 .../src/mapi/glapi/gen/NV_primitive_restart.xml    |    2 +-
 mesalib/src/mapi/glapi/gen/OES_fixed_point.xml     |  191 +-
 .../src/mapi/glapi/gen/OES_single_precision.xml    |   20 +-
 mesalib/src/mapi/glapi/gen/es_EXT.xml              |   73 +-
 mesalib/src/mapi/glapi/gen/gl_API.dtd              |    3 +-
 mesalib/src/mapi/glapi/gen/gl_API.xml              | 1946 ++++++++++----------
 mesalib/src/mapi/glapi/gen/gl_XML.py               |   52 +-
 mesalib/src/mapi/glapi/gen/gl_and_es_API.xml       |  172 +-
 mesalib/src/mapi/glapi/gen/gl_genexec.py           |    5 +-
 27 files changed, 1351 insertions(+), 1486 deletions(-)

(limited to 'mesalib/src/mapi/glapi')

diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
index 2bffc4e08..5eb53b14e 100644
--- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
+++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
@@ -10,9 +10,9 @@
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArraysAPPLE" offset="assign" static_dispatch="false">
+    <function name="DeleteVertexArraysAPPLE" static_dispatch="false" alias="DeleteVertexArrays">
         <param name="n" type="GLsizei"/>
-	<param name="arrays" type="const GLuint *" count="n"/>
+	<param name="arrays" type="const GLuint *"/>
     </function>
 
     <function name="GenVertexArraysAPPLE" offset="assign"
@@ -21,7 +21,7 @@
 	<param name="arrays" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="IsVertexArrayAPPLE" offset="assign" static_dispatch="false">
+    <function name="IsVertexArrayAPPLE" static_dispatch="false" alias="IsVertexArray">
         <param name="array" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml
index 7acf27155..edc10436e 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml
@@ -14,10 +14,9 @@
   <enum name="CLAMP_READ_COLOR_ARB"             value="0x891C"/>
   <enum name="FIXED_ONLY_ARB"                   value="0x891D"/>
 
-  <function name="ClampColorARB" offset="assign">
+  <function name="ClampColorARB" alias="ClampColor">
     <param name="target" type="GLenum"/>
     <param name="clamp" type="GLenum"/>
-    <glx rop="234"/>
   </function>
 
 </category>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml
index 3d4717267..45184eb04 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml
@@ -55,10 +55,9 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="DrawBuffersARB" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="bufs" type="const GLenum *" count="n"/>
-        <glx rop="233" large="true"/>
+    <function name="DrawBuffersARB" alias="DrawBuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="bufs" type="const GLenum *"/>
     </function>
 </category>
 
@@ -115,7 +114,7 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="DrawBuffersATI" alias="DrawBuffersARB">
+    <function name="DrawBuffersATI" alias="DrawBuffers">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="bufs" type="const GLenum *" count="n"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
index c08017aa5..0b6947cc5 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
@@ -8,25 +8,24 @@
 
 <category name="GL_ARB_draw_buffers_blend" number="69">
 
-    <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB">
+    <function name="BlendEquationiARB" offset="assign">
         <param name="buf" type="GLuint"/>
         <param name="mode" type="GLenum"/>
     </function>
 
-    <function name="BlendEquationSeparateiARB" offset="assign"
-              mesa_name="-ARB">
+    <function name="BlendEquationSeparateiARB" offset="assign">
         <param name="buf" type="GLuint"/>
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
     </function>
 
-    <function name="BlendFunciARB" offset="assign" mesa_name="-ARB">
+    <function name="BlendFunciARB" offset="assign">
         <param name="buf" type="GLuint"/>
         <param name="src" type="GLenum"/>
         <param name="dst" type="GLenum"/>
     </function>
 
-    <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB">
+    <function name="BlendFuncSeparateiARB" offset="assign">
         <param name="buf" type="GLuint"/>
         <param name="srcRGB" type="GLenum"/>
         <param name="dstRGB" type="GLenum"/>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index c9649aced..87eda93eb 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -140,33 +140,38 @@
 
 
 
-    <function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0">
+    <function name="IsRenderbuffer" es2="2.0" offset="assign">
         <param name="renderbuffer" type="GLuint"/>
 	<return type="GLboolean"/>
+	<glx vendorpriv="1422"/>
     </function>
 
-    <function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0">
+    <function name="BindRenderbuffer" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
+	<glx rop="4316"/>
     </function>
 
-    <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT"
-              es2="2.0">
+    <function name="DeleteRenderbuffers"
+              es2="2.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="const GLuint *" count="n"/>
+	<glx rop="4317"/>
     </function>
 
-    <function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0">
+    <function name="GenRenderbuffers" es2="2.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="GLuint *" count="n" output="true"/>
+	<glx vendorpriv="1423" always_array="true"/>
     </function>
 
-    <function name="RenderbufferStorage" alias="RenderbufferStorageEXT"
-              es2="2.0">
+    <function name="RenderbufferStorage"
+              es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
+	<glx rop="4318"/>
     </function>
 
     <function name="RenderbufferStorageMultisample" offset="assign" es2="3.0">
@@ -178,91 +183,101 @@
         <glx rop="4331"/>
     </function>
 
-    <function name="GetRenderbufferParameteriv"
-              alias="GetRenderbufferParameterivEXT" es2="2.0">
+    <function name="GetRenderbufferParameteriv" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
+	<glx vendorpriv="1424"/>
     </function>
 
-    <function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0">
+    <function name="IsFramebuffer" es2="2.0" offset="assign">
         <param name="framebuffer" type="GLuint"/>
 	<return type="GLboolean"/>
+	<glx vendorpriv="1425"/>
     </function>
 
-    <function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0">
+    <function name="BindFramebuffer" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="framebuffer" type="GLuint"/>
+	<glx rop="4319"/>
     </function>
 
-    <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT"
-              es2="2.0">
+    <function name="DeleteFramebuffers"
+              es2="2.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="const GLuint *" count="n"/>
+	<glx rop="4320"/>
     </function>
 
-    <function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0">
+    <function name="GenFramebuffers" es2="2.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="GLuint *" count="n" output="true"/>
+	<glx vendorpriv="1426" always_array="true"/>
     </function>
 
-    <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT"
-              es2="2.0">
+    <function name="CheckFramebufferStatus"
+              es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
 	<return type="GLenum"/>
+	<glx vendorpriv="1427"/>
     </function>
 
-    <function name="FramebufferTexture1D" alias="FramebufferTexture1DEXT">
+    <function name="FramebufferTexture1D" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
+	<glx rop="4321"/>
     </function>
 
-    <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT"
-              es2="2.0">
+    <function name="FramebufferTexture2D"
+              es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
+	<glx rop="4322"/>
     </function>
 
-    <function name="FramebufferTexture3D" alias="FramebufferTexture3DEXT">
+    <function name="FramebufferTexture3D" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="zoffset" type="GLint"/>
+	<glx rop="4323"/>
     </function>
 
-    <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0">
+    <function name="FramebufferTextureLayer" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="layer" type="GLint"/>
+	<glx rop="237"/>
     </function>
 
-    <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT"
-              es2="2.0">
+    <function name="FramebufferRenderbuffer"
+              es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="renderbuffertarget" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
+	<glx rop="4324"/>
     </function>
 
-    <function name="GetFramebufferAttachmentParameteriv"
-              alias="GetFramebufferAttachmentParameterivEXT" es2="2.0">
+    <function name="GetFramebufferAttachmentParameteriv" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
+	<glx vendorpriv="1428"/>
     </function>
 
-    <function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0">
+    <function name="BlitFramebuffer" es2="3.0" offset="assign">
         <param name="srcX0" type="GLint"/>
         <param name="srcY0" type="GLint"/>
         <param name="srcX1" type="GLint"/>
@@ -273,10 +288,12 @@
         <param name="dstY1" type="GLint"/>
         <param name="mask" type="GLbitfield"/>
         <param name="filter" type="GLenum"/>
+        <glx rop="4330"/>
     </function>
 
-    <function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0">
+    <function name="GenerateMipmap" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
+	<glx rop="4325"/>
     </function>
 </category>
 
diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
index 73f0a9c3d..e62047c9b 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
@@ -38,7 +38,7 @@
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
     </function>
-    <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayerEXT">
+    <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayer">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml
index 9a30b0c9e..907a9d4b8 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml
+++ b/mesalib/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" mesa_name="-ARB">
+  <function name="VertexAttribDivisorARB" alias="VertexAttribDivisor">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml
index 8884591ca..ae0d689e5 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml
+++ b/mesalib/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" mesa_name="-ARB">
+    <function name="TexBufferARB" alias="TexBuffer">
         <param name="target" type="GLenum"/>
         <param name="internalFormat" type="GLenum"/>
         <param name="buffer" type="GLuint"/>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml
index 872548d1a..f2277d2bc 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml
@@ -14,9 +14,9 @@
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0">
+    <function name="DeleteVertexArrays" es2="3.0" offset="assign">
         <param name="n" type="GLsizei"/>
-        <param name="arrays" type="const GLuint *"/>
+        <param name="arrays" type="const GLuint *" count="n"/>
     </function>
 
     <function name="GenVertexArrays" offset="assign" es2="3.0">
@@ -24,7 +24,7 @@
         <param name="arrays" type="GLuint *"/>
     </function>
 
-    <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0">
+    <function name="IsVertexArray" es2="3.0" offset="assign">
         <param name="array" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml
index affd55a5f..7a22651c2 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml
+++ b/mesalib/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" mesa_name="-EXT">
+    <function name="ColorMaskIndexedEXT" alias="ColorMaski">
 	<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" mesa_name="-EXT">
+    <function name="GetBooleanIndexedvEXT" alias="GetBooleani_v">
         <param name="value" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<param name="data" type="GLboolean *"/>
     </function>
 
-    <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetIntegerIndexedvEXT" alias="GetIntegeri_v">
         <param name="value" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<param name="data" type="GLint *"/>
     </function>
 
-    <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT">
+    <function name="EnableIndexedEXT" alias="Enablei">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
     </function>
 
-    <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT">
+    <function name="DisableIndexedEXT" alias="Disablei">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
     </function>
 
-    <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT">
+    <function name ="IsEnabledIndexedEXT" alias="IsEnabledi">
         <param name="target" type="GLenum"/>
 	<param name="index" type="GLuint"/>
 	<return type="GLboolean"/>
diff --git a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml
index 4f418f7b6..85a05f6ed 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml
@@ -15,19 +15,19 @@
     <enum name="STENCIL_INDEX16_EXT"                      value="0x8D49"/>
 
     <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT"   count="1" value="0x8CD0">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
     <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT"   count="1" value="0x8CD1">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT" count="1" value="0x8CD2">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT" count="1" value="0x8CD3">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT"    count="1" value="0x8CD4">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
 
     <enum name="COLOR_ATTACHMENT0_EXT"                    value="0x8CE0"/>
@@ -73,122 +73,105 @@
     </enum>
     <enum name="INVALID_FRAMEBUFFER_OPERATION_EXT"        value="0x0506"/>
 
-    <function name="IsRenderbufferEXT" offset="assign">
+    <function name="IsRenderbufferEXT" alias="IsRenderbuffer">
         <param name="renderbuffer" type="GLuint"/>
 	<return type="GLboolean"/>
-	<glx vendorpriv="1422"/>
     </function>
 
-    <function name="BindRenderbufferEXT" offset="assign">
+    <function name="BindRenderbufferEXT" alias="BindRenderbuffer">
         <param name="target" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
-	<glx rop="4316"/>
     </function>
 
-    <function name="DeleteRenderbuffersEXT" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="renderbuffers" type="const GLuint *" count="n"/>
-	<glx rop="4317"/>
+    <function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="renderbuffers" type="const GLuint *"/>
     </function>
 
-    <function name="GenRenderbuffersEXT" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="renderbuffers" type="GLuint *" count="n" output="true"/>
-	<glx vendorpriv="1423" always_array="true"/>
+    <function name="GenRenderbuffersEXT" alias="GenRenderbuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="renderbuffers" type="GLuint *"/>
     </function>
 
-    <function name="RenderbufferStorageEXT" offset="assign">
+    <function name="RenderbufferStorageEXT" alias="RenderbufferStorage">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
-	<glx rop="4318"/>
     </function>
 
-    <function name="GetRenderbufferParameterivEXT" offset="assign">
+    <function name="GetRenderbufferParameterivEXT" alias="GetRenderbufferParameteriv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true"/>
-	<glx vendorpriv="1424"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="IsFramebufferEXT" offset="assign">
+    <function name="IsFramebufferEXT" alias="IsFramebuffer">
         <param name="framebuffer" type="GLuint"/>
 	<return type="GLboolean"/>
-	<glx vendorpriv="1425"/>
     </function>
 
-    <function name="BindFramebufferEXT" offset="assign">
+    <function name="BindFramebufferEXT" alias="BindFramebuffer">
         <param name="target" type="GLenum"/>
         <param name="framebuffer" type="GLuint"/>
-	<glx rop="4319"/>
     </function>
 
-    <function name="DeleteFramebuffersEXT" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="framebuffers" type="const GLuint *" count="n"/>
-	<glx rop="4320"/>
+    <function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="framebuffers" type="const GLuint *"/>
     </function>
 
-    <function name="GenFramebuffersEXT" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="framebuffers" type="GLuint *" count="n" output="true"/>
-	<glx vendorpriv="1426" always_array="true"/>
+    <function name="GenFramebuffersEXT" alias="GenFramebuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="framebuffers" type="GLuint *"/>
     </function>
 
-    <function name="CheckFramebufferStatusEXT" offset="assign">
+    <function name="CheckFramebufferStatusEXT" alias="CheckFramebufferStatus">
         <param name="target" type="GLenum"/>
 	<return type="GLenum"/>
-	<glx vendorpriv="1427"/>
     </function>
 
-    <function name="FramebufferTexture1DEXT" offset="assign">
+    <function name="FramebufferTexture1DEXT" alias="FramebufferTexture1D">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
-	<glx rop="4321"/>
     </function>
 
-    <function name="FramebufferTexture2DEXT" offset="assign">
+    <function name="FramebufferTexture2DEXT" alias="FramebufferTexture2D">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
-	<glx rop="4322"/>
     </function>
 
-    <function name="FramebufferTexture3DEXT" offset="assign">
+    <function name="FramebufferTexture3DEXT" alias="FramebufferTexture3D">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="zoffset" type="GLint"/>
-	<glx rop="4323"/>
     </function>
 
-    <function name="FramebufferRenderbufferEXT" offset="assign">
+    <function name="FramebufferRenderbufferEXT" alias="FramebufferRenderbuffer">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="renderbuffertarget" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
-	<glx rop="4324"/>
     </function>
 
-    <function name="GetFramebufferAttachmentParameterivEXT" offset="assign">
+    <function name="GetFramebufferAttachmentParameterivEXT" alias="GetFramebufferAttachmentParameteriv">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true"/>
-	<glx vendorpriv="1428"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GenerateMipmapEXT" offset="assign">
+    <function name="GenerateMipmapEXT" alias="GenerateMipmap">
         <param name="target" type="GLenum"/>
-	<glx rop="4325"/>
     </function>
 </category>
 
@@ -201,7 +184,7 @@
     <enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA">
         <size name="Get" mode="get"/>
     </enum>
-    <function name="BlitFramebufferEXT" offset="assign" static_dispatch="false">
+    <function name="BlitFramebufferEXT" static_dispatch="false" alias="BlitFramebuffer">
         <param name="srcX0" type="GLint"/>
         <param name="srcY0" type="GLint"/>
         <param name="srcX1" type="GLint"/>
@@ -212,7 +195,6 @@
         <param name="dstY1" type="GLint"/>
         <param name="mask" type="GLbitfield"/>
         <param name="filter" type="GLenum"/>
-        <glx rop="4330"/>
     </function>
 </category>
 
diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index b008f2e65..d204c3fc7 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -96,8 +96,7 @@
         <param name="w" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI1ivEXT" alias="VertexAttribI1iv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *"/>
     </function>
@@ -117,8 +116,7 @@
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI1uivEXT" alias="VertexAttribI1uiv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *"/>
     </function>
@@ -138,31 +136,27 @@
         <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI4bvEXT" alias="VertexAttribI4bv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="VertexAttribI4svEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI4svEXT" alias="VertexAttribI4sv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI4ubvEXT" alias="VertexAttribI4ubv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *"/>
     </function>
 
-    <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback"
-              mesa_name="-EXT">
+    <function name="VertexAttribI4usvEXT" alias="VertexAttribI4usv">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLushort *"/>
     </function>
 
-    <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT">
+    <function name="VertexAttribIPointerEXT" alias="VertexAttribIPointer">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
@@ -170,37 +164,37 @@
         <param name="pointer" type="const GLvoid *"/>
     </function>
 
-    <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetVertexAttribIivEXT" alias="GetVertexAttribIiv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetVertexAttribIuivEXT" alias="GetVertexAttribIuiv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint *"/>
     </function>
 
-    <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform1uiEXT" alias="Uniform1ui">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
     </function>
 
-    <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform2uiEXT" alias="Uniform2ui">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
     </function>
 
-    <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform3uiEXT" alias="Uniform3ui">
         <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" mesa_name="-EXT">
+    <function name="Uniform4uiEXT" alias="Uniform4ui">
         <param name="location" type="GLint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
@@ -208,43 +202,43 @@
         <param name="w" type="GLuint"/>
     </function>
 
-    <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform1uivEXT" alias="Uniform1uiv">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform2uivEXT" alias="Uniform2uiv">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform3uivEXT" alias="Uniform3uiv">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT">
+    <function name="Uniform4uivEXT" alias="Uniform4uiv">
         <param name="location" type="GLint"/>
 	<param name="count" type="GLsizei"/>
         <param name="value" type="const GLuint *"/>
     </function>
 
-    <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetUniformuivEXT" alias="GetUniformuiv">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLuint *"/>
     </function>
 
-    <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT">
+    <function name="BindFragDataLocationEXT" alias="BindFragDataLocation">
         <param name="program" type="GLuint"/>
         <param name="colorNumber" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
     </function>
 
-    <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetFragDataLocationEXT" alias="GetFragDataLocation">
 	<return type="GLint"/>
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
diff --git a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml
index 71d2c7290..eb872098d 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml
@@ -13,7 +13,7 @@
     <enum name="PROVOKING_VERTEX_EXT"                         value="0x8E4F"/>
     <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT" value="0x8E4C"/>
 
-    <function name="ProvokingVertexEXT" offset="assign">
+    <function name="ProvokingVertexEXT" alias="ProvokingVertex">
         <param name="mode" type="GLenum"/>
     </function>
 
@@ -26,7 +26,7 @@
     <enum name="PROVOKING_VERTEX"                         value="0x8E4F"/>
     <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION" value="0x8E4C"/>
 
-    <function name="ProvokingVertex" alias="ProvokingVertexEXT">
+    <function name="ProvokingVertex" offset="assign">
         <param name="mode" type="GLenum"/>
     </function>
 
diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml
index b5b8bd406..c68c1fceb 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml
@@ -26,16 +26,15 @@
     </enum>
 
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"   count="1" value="0x8CD4">
-        <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
+        <size name="GetFramebufferAttachmentParameteriv" mode="get"/>
     </enum>
 
-    <function name="FramebufferTextureLayerEXT" offset="assign">
+    <function name="FramebufferTextureLayerEXT" alias="FramebufferTextureLayer">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="layer" type="GLint"/>
-	<glx rop="237"/>
     </function>
 </category>
 
diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml
index dac399964..aca21f4b1 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml
@@ -69,25 +69,25 @@
         <param name="a" type="GLuint"/>
     </function>
 
-    <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT">
+    <function name="TexParameterIivEXT" alias="TexParameterIiv">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT">
+    <function name="TexParameterIuivEXT" alias="TexParameterIuiv">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="const GLuint *"/>
     </function>
 
-    <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetTexParameterIivEXT" alias="GetTexParameterIiv">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT">
+    <function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv">
         <param name="target" type="GLenum"/>
         <param name="pname"  type="GLenum"/>
         <param name="params" type="GLuint *"/>
diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml
index e9b27582a..e4b310ec3 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/mesalib/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" mesa_name="-EXT">
+  <function name="BindBufferRangeEXT" alias="BindBufferRange">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
@@ -39,29 +39,27 @@
     <param name="offset" type="GLintptr"/>
   </function>
 
-  <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT">
+  <function name="BindBufferBaseEXT" alias="BindBufferBase">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
+  <function name="BeginTransformFeedbackEXT" alias="BeginTransformFeedback">
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
+  <function name="EndTransformFeedbackEXT" alias="EndTransformFeedback">
   </function>
 
-  <function name="TransformFeedbackVaryingsEXT" offset="assign"
-            mesa_name="-EXT">
+  <function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings">
     <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"
-            mesa_name="-EXT">
+  <function name="GetTransformFeedbackVaryingEXT" alias="GetTransformFeedbackVarying">
     <param name="program" type="GLuint"/>
     <param name="index" type="GLuint"/>
     <param name="bufSize" type="GLsizei"/>
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index ad12102c6..83b5d499a 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -150,14 +150,15 @@
       <return type="const GLubyte *"/>
   </function>
 
-  <function name="ClampColor" alias="ClampColorARB">
+  <function name="ClampColor" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="clamp" type="GLenum"/>
+    <glx rop="234"/>
   </function>
 
   <!-- These functions alias ones form GL_ARB_draw_buffers2 -->
 
-  <function name="ColorMaski" alias="ColorMaskIndexedEXT">
+  <function name="ColorMaski" offset="assign">
     <param name="buf" type="GLuint"/>
     <param name="r" type="GLboolean"/>
     <param name="g" type="GLboolean"/>
@@ -165,29 +166,29 @@
     <param name="a" type="GLboolean"/>
   </function>
 
-  <function name="GetBooleani_v" alias="GetBooleanIndexedvEXT">
+  <function name="GetBooleani_v" offset="assign">
     <param name="value" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLboolean *"/>
   </function>
 
-  <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0">
+  <function name="GetIntegeri_v" es2="3.0" offset="assign">
     <param name="value" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLint *"/>
   </function>
 
-  <function name="Enablei" alias="EnableIndexedEXT">
+  <function name="Enablei" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
   </function>
 
-  <function name="Disablei" alias="DisableIndexedEXT">
+  <function name="Disablei" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
   </function>
 
-  <function name="IsEnabledi" alias="IsEnabledIndexedEXT">
+  <function name="IsEnabledi" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
       <return type="GLboolean"/>
@@ -195,26 +196,26 @@
 
   <!-- These functions alias ones form GL_EXT_transform_feedback -->
 
-  <function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0">
+  <function name="GetFragDataLocation" es2="3.0" offset="assign">
     <param name="program" type="GLuint"/>
     <param name="name" type="const GLchar *"/>
       <return type="GLint"/>
   </function>
 
-  <function name="BindFragDataLocation" alias="BindFragDataLocationEXT">
+  <function name="BindFragDataLocation" offset="assign">
     <param name="program" type="GLuint"/>
     <param name="colorNumber" type="GLuint"/>
     <param name="name" type="const GLchar *"/>
   </function>
 
-  <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0">
+  <function name="BeginTransformFeedback" es2="3.0" offset="assign">
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0">
+  <function name="EndTransformFeedback" es2="3.0" offset="assign">
   </function>
 
-  <function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0">
+  <function name="BindBufferRange" es2="3.0" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
@@ -222,20 +223,20 @@
     <param name="size" type="GLsizeiptr"/>
   </function>
 
-  <function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0">
+  <function name="BindBufferBase" es2="3.0" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0">
+  <function name="TransformFeedbackVaryings" es2="3.0" offset="assign">
     <param name="program" type="GLuint"/>
     <param name="count" type="GLsizei"/>
     <param name="varyings" type="const GLchar * const *"/>
     <param name="bufferMode" type="GLenum"/>
   </function>
 
-  <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0">
+  <function name="GetTransformFeedbackVarying" es2="3.0" offset="assign">
     <param name="program" type="GLuint"/>
     <param name="index" type="GLuint"/>
     <param name="bufSize" type="GLsizei"/>
@@ -247,17 +248,17 @@
 
   <!-- These functions alias ones from GL_NV_conditional_render -->
 
-  <function name="BeginConditionalRender" alias="BeginConditionalRenderNV">
+  <function name="BeginConditionalRender" offset="assign">
     <param name="query" type="GLuint"/>
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndConditionalRender" alias="EndConditionalRenderNV">
+  <function name="EndConditionalRender" offset="assign">
   </function>
 
   <!-- These functions alias ones from GL_EXT_gpu_shader4 -->
 
-  <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0">
+  <function name="VertexAttribIPointer" es2="3.0" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="size" type="GLint"/>
     <param name="type" type="GLenum"/>
@@ -265,13 +266,13 @@
     <param name="pointer" type="const GLvoid *"/>
   </function>
 
-  <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0">
+  <function name="GetVertexAttribIiv" es2="3.0" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLint *"/>
   </function>
 
-  <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0">
+  <function name="GetVertexAttribIuiv" es2="3.0" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLuint *"/>
@@ -329,7 +330,7 @@
     <param name="w" type="GLuint"/>
   </function>
 
-  <function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT">
+  <function name="VertexAttribI1iv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLint *"/>
   </function>
@@ -349,7 +350,7 @@
     <param name="v" type="const GLint *"/>
   </function>
 
-  <function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT">
+  <function name="VertexAttribI1uiv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLuint *"/>
   </function>
@@ -369,51 +370,51 @@
     <param name="v" type="const GLuint *"/>
   </function>
 
-  <function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT">
+  <function name="VertexAttribI4bv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLbyte *"/>
   </function>
 
-  <function name="VertexAttribI4sv" alias="VertexAttribI4svEXT">
+  <function name="VertexAttribI4sv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLshort *"/>
   </function>
 
-  <function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT">
+  <function name="VertexAttribI4ubv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLubyte *"/>
   </function>
 
-  <function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT">
+  <function name="VertexAttribI4usv" offset="assign">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLushort *"/>
   </function>
 
-  <function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0">
+  <function name="GetUniformuiv" es2="3.0" offset="assign">
     <param name="program" type="GLuint"/>
     <param name="location" type="GLint"/>
     <param name="params" type="GLuint *"/>
   </function>
 
-  <function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0">
+  <function name="Uniform1ui" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
   </function>
 
-  <function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0">
+  <function name="Uniform2ui" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
   </function>
 
-  <function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0">
+  <function name="Uniform3ui" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
     <param name="z" type="GLuint"/>
   </function>
 
-  <function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0">
+  <function name="Uniform4ui" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
@@ -421,25 +422,25 @@
     <param name="w" type="GLuint"/>
   </function>
 
-  <function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0">
+  <function name="Uniform1uiv" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0">
+  <function name="Uniform2uiv" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0">
+  <function name="Uniform3uiv" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0">
+  <function name="Uniform4uiv" es2="3.0" offset="assign">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
@@ -447,25 +448,25 @@
 
   <!-- These functions alias ones from GL_EXT_texture_integer -->
 
-  <function name="TexParameterIiv" alias="TexParameterIivEXT">
+  <function name="TexParameterIiv" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="const GLint *"/>
   </function>
 
-  <function name="TexParameterIuiv" alias="TexParameterIuivEXT">
+  <function name="TexParameterIuiv" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="const GLuint *"/>
   </function>
 
-  <function name="GetTexParameterIiv" alias="GetTexParameterIivEXT">
+  <function name="GetTexParameterIiv" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLint *"/>
   </function>
 
-  <function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT">
+  <function name="GetTexParameterIuiv" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLuint *"/>
@@ -556,13 +557,13 @@
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="TexBuffer" offset="assign" alias="TexBufferARB">
+  <function name="TexBuffer" offset="assign">
     <param name="target" type="GLenum"/>
     <param name="internalFormat" type="GLenum"/>
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV">
+  <function name="PrimitiveRestartIndex" offset="assign">
     <param name="index" type="GLuint"/>
   </function>
 
@@ -625,8 +626,7 @@
   <enum name="TEXTURE_SWIZZLE_A"                value="0x8E45"/>
   <enum name="TEXTURE_SWIZZLE_RGBA"             value="0x8E46"/>
 
-  <function name="VertexAttribDivisor" offset="assign" es2="3.0"
-            alias="VertexAttribDivisorARB">
+  <function name="VertexAttribDivisor" offset="assign" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
diff --git a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml
index 8bb5c22ca..926b26294 100644
--- a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml
+++ b/mesalib/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" mesa_name="-NV">
+    <function name="BeginConditionalRenderNV" alias="BeginConditionalRender">
 	<param name="query" type="GLuint"/>
 	<param name="mode" type="GLenum"/>
     </function>
 
-    <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV">
+    <function name="EndConditionalRenderNV" alias="EndConditionalRender">
     </function>
 
 </category>
diff --git a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml
index d19fc8cf1..39edafe31 100644
--- a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml
+++ b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml
@@ -15,7 +15,7 @@
               exec="dynamic">
     </function>
 
-    <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV">
+    <function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex">
 	<param name="index" type="GLuint"/>
     </function>
 
diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
index ad775728f..d62d6e2ec 100644
--- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -13,53 +13,52 @@
     <type name="clampx"  size="4"                                    />
 
     <!-- OpenGL ES 1.0 -->
-    <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="AlphaFuncxOES" static_dispatch="false"
+              es1="1.0" alias="AlphaFuncx">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="ClearColorxOES" static_dispatch="false"
+              es1="1.0" alias="ClearColorx">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
         <param name="alpha" type="GLclampx"/>
     </function>
 
-    <function name="ClearDepthxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="ClearDepthxOES" static_dispatch="false"
+              es1="1.0" alias="ClearDepthx">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="Color4xOES" static_dispatch="false"
+              es1="1.0" alias="Color4x">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
         <param name="alpha" type="GLfixed"/>
     </function>
 
-    <function name="DepthRangexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="DepthRangexOES" static_dispatch="false"
+              es1="1.0" alias="DepthRangex">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"
-              exec="es" mesa_name="-OES">
+    <function name="FogxOES" static_dispatch="false" es1="1.0" alias="Fogx">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="FogxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="FogxvOES" static_dispatch="false"
+              es1="1.0" alias="Fogxv">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="FrustumxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="FrustumxOES" static_dispatch="false"
+              es1="1.0" alias="Frustumx">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -68,63 +67,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="LightModelxOES" static_dispatch="false"
+              es1="1.0" alias="LightModelx">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="LightModelxvOES" static_dispatch="false"
+              es1="1.0" alias="LightModelxv">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="LightxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="LightxOES" static_dispatch="false"
+              es1="1.0" alias="Lightx">
         <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" mesa_name="-OES">
+    <function name="LightxvOES" static_dispatch="false"
+              es1="1.0" alias="Lightxv">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="LineWidthxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="LineWidthxOES" static_dispatch="false"
+              es1="1.0" alias="LineWidthx">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
-        <param name="m" type="const GLfixed *" count="16"/>
+    <function name="LoadMatrixxOES" static_dispatch="false"
+              es1="1.0" alias="LoadMatrixx">
+        <param name="m" type="const GLfixed *"/>
     </function>
 
-    <function name="MaterialxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="MaterialxOES" static_dispatch="false"
+              es1="1.0" alias="Materialx">
         <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" mesa_name="-OES">
+    <function name="MaterialxvOES" static_dispatch="false"
+              es1="1.0" alias="Materialxv">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="MultMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
-        <param name="m" type="const GLfixed *" count="16"/>
+    <function name="MultMatrixxOES" static_dispatch="false"
+              es1="1.0" alias="MultMatrixx">
+        <param name="m" type="const GLfixed *"/>
     </function>
 
-    <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="MultiTexCoord4xOES" static_dispatch="false"
+              es1="1.0" alias="MultiTexCoord4x">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -132,15 +131,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3xOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="Normal3xOES" static_dispatch="false"
+              es1="1.0" alias="Normal3x">
         <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" mesa_name="-OES">
+    <function name="OrthoxOES" static_dispatch="false"
+              es1="1.0" alias="Orthox">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -149,149 +148,149 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="PointSizexOES" static_dispatch="false"
+              es1="1.0" alias="PointSizex">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="PolygonOffsetxOES" static_dispatch="false"
+              es1="1.0" alias="PolygonOffsetx">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="RotatexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="RotatexOES" static_dispatch="false"
+              es1="1.0" alias="Rotatex">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="SampleCoveragexOES" static_dispatch="false"
+              es1="1.0" alias="SampleCoveragex">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="ScalexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="ScalexOES" static_dispatch="false"
+              es1="1.0" alias="Scalex">
         <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" mesa_name="-OES">
+    <function name="TexEnvxOES" static_dispatch="false"
+              es1="1.0" alias="TexEnvx">
         <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" mesa_name="-OES">
+    <function name="TexEnvxvOES" static_dispatch="false"
+              es1="1.0" alias="TexEnvxv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="TexParameterxOES" static_dispatch="false"
+              es1="1.0" alias="TexParameterx">
         <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" mesa_name="-OES">
+    <function name="TranslatexOES" static_dispatch="false"
+              es1="1.0" alias="Translatex">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- OpenGL ES 1.1 -->
-    <function name="ClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="ClipPlanexOES" static_dispatch="false"
+              es1="1.0" alias="ClipPlanex">
         <param name="plane" type="GLenum"/>
-        <param name="equation" type="const GLfixed *" count="4"/>
+        <param name="equation" type="const GLfixed *"/>
     </function>
 
-    <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false" mesa_name="-OES">
+    <function name="GetClipPlanexOES" static_dispatch="false"
+              es1="1.0" desktop="false" alias="GetClipPlanex">
         <param name="plane" type="GLenum"/>
-        <param name="equation" type="GLfixed *" output="true" count="4"/>
+        <param name="equation" type="GLfixed *"/>
     </function>
 
-    <function name="GetFixedvOES" offset="assign" static_dispatch="false"
-              es1="1.0" mesa_name="-OES">
+    <function name="GetFixedvOES" static_dispatch="false"
+              es1="1.0" alias="GetFixedv">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
+        <param name="params" type="GLfixed *"/>
     </function>
 
-    <function name="GetLightxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="GetLightxvOES" static_dispatch="false"
+              es1="1.0" alias="GetLightxv">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
+        <param name="params" type="GLfixed *"/>
     </function>
 
-    <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="GetMaterialxvOES" static_dispatch="false"
+              es1="1.0" alias="GetMaterialxv">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
+        <param name="params" type="GLfixed *"/>
     </function>
 
-    <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="GetTexEnvxvOES" static_dispatch="false"
+              es1="1.0" alias="GetTexEnvxv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
+        <param name="params" type="GLfixed *"/>
     </function>
 
-    <function name="GetTexParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
+    <function name="GetTexParameterxvOES"
+              static_dispatch="false" es1="1.0" alias="GetTexParameterxv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
+        <param name="params" type="GLfixed *"/>
     </function>
 
-    <function name="PointParameterxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="PointParameterxOES" static_dispatch="false"
+              es1="1.0" alias="PointParameterx">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxvOES" offset="assign"
-              static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
+    <function name="PointParameterxvOES"
+              static_dispatch="false" es1="1.0" alias="PointParameterxv">
         <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" mesa_name="-OES">
+    <function name="TexParameterxvOES" static_dispatch="false"
+              es1="1.0" alias="TexParameterxv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfixed *" variable_param="pname"/>
+        <param name="params" type="const GLfixed *"/>
     </function>
 
     <!-- texgen -->
     <function name="GetTexGenxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="check" desktop="false">
+              es1="1.0" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
     <function name="TexGenxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="check" desktop="false">
+              es1="1.0" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
     <function name="TexGenxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="check" desktop="false">
+              es1="1.0" desktop="false">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml
index 8a6c27194..8346b64ee 100644
--- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml
+++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml
@@ -11,10 +11,10 @@
         <param name="depth" type="GLclampf"/>
     </function>
 
-    <function name="ClipPlanefOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="ClipPlanefOES" static_dispatch="false"
+              es1="1.0" alias="ClipPlanef">
         <param name="plane" type="GLenum"/>
-        <param name="equation" type="const GLfloat *" count="4"/>
+        <param name="equation" type="const GLfloat *"/>
     </function>
 
     <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false"
@@ -23,14 +23,14 @@
         <param name="zFar" type="GLclampf"/>
     </function>
 
-    <function name="GetClipPlanefOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false" mesa_name="-OES">
+    <function name="GetClipPlanefOES" static_dispatch="false"
+              es1="1.0" desktop="false" alias="GetClipPlanef">
         <param name="plane" type="GLenum"/>
-        <param name="equation" type="GLfloat *" output="true" count="4"/>
+        <param name="equation" type="GLfloat *"/>
     </function>
 
-    <function name="FrustumfOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="FrustumfOES" static_dispatch="false"
+              es1="1.0" alias="Frustumf">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -39,8 +39,8 @@
         <param name="zFar" type="GLfloat"/>
     </function>
 
-    <function name="OrthofOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" mesa_name="-OES">
+    <function name="OrthofOES" static_dispatch="false"
+              es1="1.0" alias="Orthof">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml
index c0bbbfae1..0f6746d2a 100644
--- a/mesalib/src/mapi/glapi/gen/es_EXT.xml
+++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml
@@ -10,7 +10,7 @@
     <enum name="BLEND_EQUATION_RGB_OES"                   value="0x8009"/>
     <enum name="BLEND_EQUATION_ALPHA_OES"                 value="0x883D"/>
 
-    <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT"
+    <function name="BlendEquationSeparateOES" alias="BlendEquationSeparate"
               static_dispatch="false" es1="1.0">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
@@ -24,7 +24,7 @@
     <enum name="BLEND_DST_ALPHA_OES"                      value="0x80CA"/>
     <enum name="BLEND_SRC_ALPHA_OES"                      value="0x80CB"/>
 
-    <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT"
+    <function name="BlendFuncSeparateOES" alias="BlendFuncSeparate"
               static_dispatch="false" es1="1.0">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
@@ -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" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <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" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <param name="coords" type="const GLint *" count="5"/>
     </function>
 
     <function name="DrawTexfOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <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" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <param name="coords" type="const GLfloat *" count="5"/>
     </function>
 
     <function name="DrawTexsOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
@@ -110,12 +110,12 @@
     </function>
 
     <function name="DrawTexsvOES" offset="assign" static_dispatch="false"
-              es1="1.0" desktop="false" mesa_name="-OES">
+              es1="1.0" desktop="false">
         <param name="coords" type="const GLshort *" count="5"/>
     </function>
 
     <function name="DrawTexxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false">
+              es1="1.0" desktop="false">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
@@ -124,7 +124,7 @@
     </function>
 
     <function name="DrawTexxvOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false">
+              es1="1.0" desktop="false">
         <param name="coords" type="const GLfixed *" count="5"/>
     </function>
 
@@ -177,39 +177,39 @@
     <enum name="RENDERBUFFER_STENCIL_SIZE_OES"            value="0x8D55"/>
     <enum name="RGB565_OES"                               value="0x8D62"/>
 
-    <function name="BindFramebufferOES" alias="BindFramebufferEXT"
+    <function name="BindFramebufferOES" alias="BindFramebuffer"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="framebuffer" type="GLuint"/>
     </function>
 
-    <function name="BindRenderbufferOES" alias="BindRenderbufferEXT"
+    <function name="BindRenderbufferOES" alias="BindRenderbuffer"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
     <function name="CheckFramebufferStatusOES"
-              alias="CheckFramebufferStatusEXT" static_dispatch="false"
+              alias="CheckFramebufferStatus" static_dispatch="false"
               es1="1.0">
         <param name="target" type="GLenum"/>
 	<return type="GLenum"/>
     </function>
 
-    <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT"
+    <function name="DeleteFramebuffersOES" alias="DeleteFramebuffers"
               static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT"
+    <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffers"
               static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="const GLuint *" count="n"/>
     </function>
 
     <function name="FramebufferRenderbufferOES"
-              alias="FramebufferRenderbufferEXT" static_dispatch="false"
+              alias="FramebufferRenderbuffer" static_dispatch="false"
               es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
@@ -217,7 +217,7 @@
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
-    <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT"
+    <function name="FramebufferTexture2DOES" alias="FramebufferTexture2D"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
@@ -226,25 +226,25 @@
         <param name="level" type="GLint"/>
     </function>
 
-    <function name="GenerateMipmapOES" alias="GenerateMipmapEXT"
+    <function name="GenerateMipmapOES" alias="GenerateMipmap"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
     </function>
 
-    <function name="GenFramebuffersOES" alias="GenFramebuffersEXT"
+    <function name="GenFramebuffersOES" alias="GenFramebuffers"
               static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT"
+    <function name="GenRenderbuffersOES" alias="GenRenderbuffers"
               static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
     <function name="GetFramebufferAttachmentParameterivOES"
-              alias="GetFramebufferAttachmentParameterivEXT"
+              alias="GetFramebufferAttachmentParameteriv"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
@@ -253,26 +253,26 @@
     </function>
 
     <function name="GetRenderbufferParameterivOES"
-              alias="GetRenderbufferParameterivEXT" static_dispatch="false"
+              alias="GetRenderbufferParameteriv" static_dispatch="false"
               es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="IsFramebufferOES" alias="IsFramebufferEXT"
+    <function name="IsFramebufferOES" alias="IsFramebuffer"
               static_dispatch="false" es1="1.0">
         <param name="framebuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="IsRenderbufferOES" alias="IsRenderbufferEXT"
+    <function name="IsRenderbufferOES" alias="IsRenderbuffer"
               static_dispatch="false" es1="1.0">
         <param name="renderbuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT"
+    <function name="RenderbufferStorageOES" alias="RenderbufferStorage"
               static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
@@ -343,8 +343,7 @@
     <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES"	  value="0x8B9F"/>
 
     <function name="PointSizePointerOES" offset="assign"
-              static_dispatch="false" es1="1.0" desktop="false"
-              mesa_name="-OES">
+              static_dispatch="false" es1="1.0" desktop="false">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
@@ -360,7 +359,7 @@
 <!-- optional for es1.0 -->
 <category name="GL_OES_query_matrix" number="16">
     <function name="QueryMatrixxOES" offset="assign" static_dispatch="false"
-              es1="1.0" exec="es" desktop="false">
+              es1="1.0" desktop="false">
         <param name="mantissa" type="GLfixed *" count="16" />
         <param name="exponent" type="GLint *" count="16" />
 	<return type="GLbitfield"/>
@@ -460,21 +459,21 @@
     <enum name="BUFFER_MAPPED_OES"                        value="0x88BC"/>
     <enum name="BUFFER_MAP_POINTER_OES"                   value="0x88BD"/>
 
-    <function name="GetBufferPointervOES" alias="GetBufferPointervARB"
+    <function name="GetBufferPointervOES" alias="GetBufferPointerv"
               static_dispatch="false" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **"/>
     </function>
 
-    <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false"
+    <function name="MapBufferOES" alias="MapBuffer" static_dispatch="false"
               es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="access" type="GLenum"/>
 	<return type="GLvoid *"/>
     </function>
 
-    <function name="UnmapBufferOES" alias="UnmapBufferARB"
+    <function name="UnmapBufferOES" alias="UnmapBuffer"
               static_dispatch="false" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
 	<return type="GLboolean"/>
@@ -506,7 +505,7 @@
     <enum name="SAMPLER_3D_OES"                           value="0x8B5F"/>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/>
 
-    <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB"
+    <function name="CompressedTexImage3DOES" alias="CompressedTexImage3D"
               static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
@@ -520,7 +519,7 @@
     </function>
 
     <function name="CompressedTexSubImage3DOES"
-              alias="CompressedTexSubImage3DARB" static_dispatch="false"
+              alias="CompressedTexSubImage3D" static_dispatch="false"
               es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
@@ -548,7 +547,7 @@
         <param name="height" type="GLsizei"/>
     </function>
 
-    <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT"
+    <function name="FramebufferTexture3DOES" alias="FramebufferTexture3D"
               static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
@@ -680,7 +679,7 @@
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE"
+    <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
               es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="const GLuint *" count="n"/>
@@ -691,7 +690,7 @@
         <param name="arrays" type="GLuint *" output="true" count="n"/>
     </function>
 
-    <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0">
+    <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
         <param name="array" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
@@ -766,7 +765,7 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0">
+    <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="bufs" type="const GLenum *" count="n"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd
index 066d5da52..ab321fad0 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.dtd
+++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd
@@ -40,8 +40,7 @@
                    es2                 CDATA   "none"
                    deprecated          CDATA   "none"
                    exec                NMTOKEN #IMPLIED
-                   desktop             (true | false) "true"
-                   mesa_name           CDATA   #IMPLIED>
+                   desktop             (true | false) "true">
 <!ATTLIST size     name                NMTOKEN #REQUIRED
                    count               NMTOKEN #IMPLIED
                    mode                (get | set) "set">
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 9645fdb81..a47316a83 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -1164,27 +1164,25 @@
     </function>
 
     <function name="Color3b" offset="9" vectorequiv="Color3bv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3bv" offset="10" deprecated="3.1">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="6"/>
     </function>
 
     <function name="Color3d" offset="11" vectorequiv="Color3dv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3dv" offset="12" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="7"/>
     </function>
@@ -1202,94 +1200,87 @@
     </function>
 
     <function name="Color3i" offset="15" vectorequiv="Color3iv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3iv" offset="16" deprecated="3.1">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="9"/>
     </function>
 
     <function name="Color3s" offset="17" vectorequiv="Color3sv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3sv" offset="18" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="10"/>
     </function>
 
     <function name="Color3ub" offset="19" vectorequiv="Color3ubv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3ubv" offset="20" deprecated="3.1">
         <param name="v" type="const GLubyte *" count="3"/>
         <glx rop="11"/>
     </function>
 
     <function name="Color3ui" offset="21" vectorequiv="Color3uiv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3uiv" offset="22" deprecated="3.1">
         <param name="v" type="const GLuint *" count="3"/>
         <glx rop="12"/>
     </function>
 
     <function name="Color3us" offset="23" vectorequiv="Color3usv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color3usv" offset="24" deprecated="3.1">
         <param name="v" type="const GLushort *" count="3"/>
         <glx rop="13"/>
     </function>
 
     <function name="Color4b" offset="25" vectorequiv="Color4bv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4bv" offset="26" deprecated="3.1">
         <param name="v" type="const GLbyte *" count="4"/>
         <glx rop="14"/>
     </function>
 
     <function name="Color4d" offset="27" vectorequiv="Color4dv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4dv" offset="28" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="15"/>
     </function>
@@ -1308,71 +1299,66 @@
     </function>
 
     <function name="Color4i" offset="31" vectorequiv="Color4iv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4iv" offset="32" deprecated="3.1">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="17"/>
     </function>
 
     <function name="Color4s" offset="33" vectorequiv="Color4sv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4sv" offset="34" deprecated="3.1">
         <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" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4ubv" offset="36" deprecated="3.1">
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="19"/>
     </function>
 
     <function name="Color4ui" offset="37" vectorequiv="Color4uiv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4uiv" offset="38" deprecated="3.1">
         <param name="v" type="const GLuint *" count="4"/>
         <glx rop="20"/>
     </function>
 
     <function name="Color4us" offset="39" vectorequiv="Color4usv"
-              deprecated="3.1" exec="loopback" mesa_name="+_f">
+              deprecated="3.1">
         <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"
-              mesa_name="+_f">
+    <function name="Color4usv" offset="40" deprecated="3.1">
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="21"/>
     </function>
@@ -1382,7 +1368,7 @@
         <param name="flag" type="GLboolean"/>
     </function>
 
-    <function name="EdgeFlagv" offset="42" deprecated="3.1" exec="loopback">
+    <function name="EdgeFlagv" offset="42" deprecated="3.1">
         <param name="flag" type="const GLboolean *" count="1"/>
         <glx rop="22"/>
     </function>
@@ -1391,12 +1377,11 @@
         <glx rop="23"/>
     </function>
 
-    <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1"
-              exec="loopback">
+    <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1">
         <param name="c" type="GLdouble"/>
     </function>
 
-    <function name="Indexdv" offset="45" deprecated="3.1" exec="loopback">
+    <function name="Indexdv" offset="45" deprecated="3.1">
         <param name="c" type="const GLdouble *" count="1"/>
         <glx rop="24"/>
     </function>
@@ -1411,46 +1396,44 @@
         <glx rop="25"/>
     </function>
 
-    <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1"
-              exec="loopback">
+    <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1">
         <param name="c" type="GLint"/>
     </function>
 
-    <function name="Indexiv" offset="49" deprecated="3.1" exec="loopback">
+    <function name="Indexiv" offset="49" deprecated="3.1">
         <param name="c" type="const GLint *" count="1"/>
         <glx rop="26"/>
     </function>
 
-    <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1"
-              exec="loopback">
+    <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1">
         <param name="c" type="GLshort"/>
     </function>
 
-    <function name="Indexsv" offset="51" deprecated="3.1" exec="loopback">
+    <function name="Indexsv" offset="51" deprecated="3.1">
         <param name="c" type="const GLshort *" count="1"/>
         <glx rop="27"/>
     </function>
 
     <function name="Normal3b" offset="52" vectorequiv="Normal3bv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="nx" type="GLbyte"/>
         <param name="ny" type="GLbyte"/>
         <param name="nz" type="GLbyte"/>
     </function>
 
-    <function name="Normal3bv" offset="53" deprecated="3.1" exec="loopback">
+    <function name="Normal3bv" offset="53" deprecated="3.1">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="28"/>
     </function>
 
     <function name="Normal3d" offset="54" vectorequiv="Normal3dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="nx" type="GLdouble"/>
         <param name="ny" type="GLdouble"/>
         <param name="nz" type="GLdouble"/>
     </function>
 
-    <function name="Normal3dv" offset="55" deprecated="3.1" exec="loopback">
+    <function name="Normal3dv" offset="55" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="29"/>
     </function>
@@ -1468,25 +1451,25 @@
     </function>
 
     <function name="Normal3i" offset="58" vectorequiv="Normal3iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="nx" type="GLint"/>
         <param name="ny" type="GLint"/>
         <param name="nz" type="GLint"/>
     </function>
 
-    <function name="Normal3iv" offset="59" deprecated="3.1" exec="loopback">
+    <function name="Normal3iv" offset="59" deprecated="3.1">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="31"/>
     </function>
 
     <function name="Normal3s" offset="60" vectorequiv="Normal3sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="nx" type="GLshort"/>
         <param name="ny" type="GLshort"/>
         <param name="nz" type="GLshort"/>
     </function>
 
-    <function name="Normal3sv" offset="61" deprecated="3.1" exec="loopback">
+    <function name="Normal3sv" offset="61" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="32"/>
     </function>
@@ -1635,15 +1618,14 @@
         <glx rop="44"/>
     </function>
 
-    <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1"
-              exec="loopback">
+    <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1">
         <param name="x1" type="GLdouble"/>
         <param name="y1" type="GLdouble"/>
         <param name="x2" type="GLdouble"/>
         <param name="y2" type="GLdouble"/>
     </function>
 
-    <function name="Rectdv" offset="87" deprecated="3.1" exec="loopback">
+    <function name="Rectdv" offset="87" deprecated="3.1">
         <param name="v1" type="const GLdouble *" count="2"/>
         <param name="v2" type="const GLdouble *" count="2"/>
         <glx rop="45"/>
@@ -1657,46 +1639,44 @@
         <param name="y2" type="GLfloat"/>
     </function>
 
-    <function name="Rectfv" offset="89" deprecated="3.1" exec="loopback">
+    <function name="Rectfv" offset="89" deprecated="3.1">
         <param name="v1" type="const GLfloat *" count="2"/>
         <param name="v2" type="const GLfloat *" count="2"/>
         <glx rop="46"/>
     </function>
 
-    <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1"
-              exec="loopback">
+    <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1">
         <param name="x1" type="GLint"/>
         <param name="y1" type="GLint"/>
         <param name="x2" type="GLint"/>
         <param name="y2" type="GLint"/>
     </function>
 
-    <function name="Rectiv" offset="91" deprecated="3.1" exec="loopback">
+    <function name="Rectiv" offset="91" deprecated="3.1">
         <param name="v1" type="const GLint *" count="2"/>
         <param name="v2" type="const GLint *" count="2"/>
         <glx rop="47"/>
     </function>
 
-    <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1"
-              exec="loopback">
+    <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1">
         <param name="x1" type="GLshort"/>
         <param name="y1" type="GLshort"/>
         <param name="x2" type="GLshort"/>
         <param name="y2" type="GLshort"/>
     </function>
 
-    <function name="Rectsv" offset="93" deprecated="3.1" exec="loopback">
+    <function name="Rectsv" offset="93" deprecated="3.1">
         <param name="v1" type="const GLshort *" count="2"/>
         <param name="v2" type="const GLshort *" count="2"/>
         <glx rop="48"/>
     </function>
 
     <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord1dv" offset="95" deprecated="3.1" exec="loopback">
+    <function name="TexCoord1dv" offset="95" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="49"/>
     </function>
@@ -1713,32 +1693,32 @@
     </function>
 
     <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="TexCoord1iv" offset="99" deprecated="3.1" exec="loopback">
+    <function name="TexCoord1iv" offset="99" deprecated="3.1">
         <param name="v" type="const GLint *" count="1"/>
         <glx rop="51"/>
     </function>
 
     <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="TexCoord1sv" offset="101" deprecated="3.1" exec="loopback">
+    <function name="TexCoord1sv" offset="101" deprecated="3.1">
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="52"/>
     </function>
 
     <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord2dv" offset="103" deprecated="3.1" exec="loopback">
+    <function name="TexCoord2dv" offset="103" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="53"/>
     </function>
@@ -1756,35 +1736,35 @@
     </function>
 
     <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="TexCoord2iv" offset="107" deprecated="3.1" exec="loopback">
+    <function name="TexCoord2iv" offset="107" deprecated="3.1">
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="55"/>
     </function>
 
     <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="TexCoord2sv" offset="109" deprecated="3.1" exec="loopback">
+    <function name="TexCoord2sv" offset="109" deprecated="3.1">
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="56"/>
     </function>
 
     <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord3dv" offset="111" deprecated="3.1" exec="loopback">
+    <function name="TexCoord3dv" offset="111" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="57"/>
     </function>
@@ -1803,38 +1783,38 @@
     </function>
 
     <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="TexCoord3iv" offset="115" deprecated="3.1" exec="loopback">
+    <function name="TexCoord3iv" offset="115" deprecated="3.1">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="59"/>
     </function>
 
     <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="TexCoord3sv" offset="117" deprecated="3.1" exec="loopback">
+    <function name="TexCoord3sv" offset="117" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="60"/>
     </function>
 
     <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord4dv" offset="119" deprecated="3.1" exec="loopback">
+    <function name="TexCoord4dv" offset="119" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="61"/>
     </function>
@@ -1854,38 +1834,38 @@
     </function>
 
     <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="TexCoord4iv" offset="123" deprecated="3.1" exec="loopback">
+    <function name="TexCoord4iv" offset="123" deprecated="3.1">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="63"/>
     </function>
 
     <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="TexCoord4sv" offset="125" deprecated="3.1" exec="loopback">
+    <function name="TexCoord4sv" offset="125" deprecated="3.1">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="64"/>
     </function>
 
     <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="Vertex2dv" offset="127" deprecated="3.1" exec="loopback">
+    <function name="Vertex2dv" offset="127" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="65"/>
     </function>
@@ -1903,35 +1883,35 @@
     </function>
 
     <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="Vertex2iv" offset="131" deprecated="3.1" exec="loopback">
+    <function name="Vertex2iv" offset="131" deprecated="3.1">
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="67"/>
     </function>
 
     <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="Vertex2sv" offset="133" deprecated="3.1" exec="loopback">
+    <function name="Vertex2sv" offset="133" deprecated="3.1">
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="68"/>
     </function>
 
     <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="Vertex3dv" offset="135" deprecated="3.1" exec="loopback">
+    <function name="Vertex3dv" offset="135" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="69"/>
     </function>
@@ -1950,38 +1930,38 @@
     </function>
 
     <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="Vertex3iv" offset="139" deprecated="3.1" exec="loopback">
+    <function name="Vertex3iv" offset="139" deprecated="3.1">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="71"/>
     </function>
 
     <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="Vertex3sv" offset="141" deprecated="3.1" exec="loopback">
+    <function name="Vertex3sv" offset="141" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="72"/>
     </function>
 
     <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="Vertex4dv" offset="143" deprecated="3.1" exec="loopback">
+    <function name="Vertex4dv" offset="143" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="73"/>
     </function>
@@ -2001,27 +1981,27 @@
     </function>
 
     <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
         <param name="w" type="GLint"/>
     </function>
 
-    <function name="Vertex4iv" offset="147" deprecated="3.1" exec="loopback">
+    <function name="Vertex4iv" offset="147" deprecated="3.1">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="75"/>
     </function>
 
     <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="Vertex4sv" offset="149" deprecated="3.1" exec="loopback">
+    <function name="Vertex4sv" offset="149" deprecated="3.1">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="76"/>
     </function>
@@ -2141,8 +2121,7 @@
         <glx rop="95"/>
     </function>
 
-    <function name="Materialf" offset="169" es1="1.0" deprecated="3.1"
-              exec="loopback">
+    <function name="Materialf" offset="169" es1="1.0" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
@@ -2157,14 +2136,14 @@
         <glx rop="97"/>
     </function>
 
-    <function name="Materiali" offset="171" deprecated="3.1" exec="loopback">
+    <function name="Materiali" offset="171" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="98"/>
     </function>
 
-    <function name="Materialiv" offset="172" deprecated="3.1" exec="loopback">
+    <function name="Materialiv" offset="172" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
@@ -2545,12 +2524,11 @@
     </function>
 
     <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="u" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord1dv" offset="229" deprecated="3.1"
-              exec="loopback">
+    <function name="EvalCoord1dv" offset="229" deprecated="3.1">
         <param name="u" type="const GLdouble *" count="1"/>
         <glx rop="151"/>
     </function>
@@ -2560,20 +2538,18 @@
         <param name="u" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord1fv" offset="231" deprecated="3.1"
-              exec="loopback">
+    <function name="EvalCoord1fv" offset="231" deprecated="3.1">
         <param name="u" type="const GLfloat *" count="1"/>
         <glx rop="152"/>
     </function>
 
     <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="u" type="GLdouble"/>
         <param name="v" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord2dv" offset="233" deprecated="3.1"
-              exec="loopback">
+    <function name="EvalCoord2dv" offset="233" deprecated="3.1">
         <param name="u" type="const GLdouble *" count="2"/>
         <glx rop="153"/>
     </function>
@@ -2584,8 +2560,7 @@
         <param name="v" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord2fv" offset="235" deprecated="3.1"
-              exec="loopback">
+    <function name="EvalCoord2fv" offset="235" deprecated="3.1">
         <param name="u" type="const GLfloat *" count="2"/>
         <glx rop="154"/>
     </function>
@@ -3439,11 +3414,11 @@
     </function>
 
     <function name="Indexub" offset="315" vectorequiv="Indexubv"
-              deprecated="3.1" exec="loopback">
+              deprecated="3.1">
         <param name="c" type="GLubyte"/>
     </function>
 
-    <function name="Indexubv" offset="316" deprecated="3.1" exec="loopback">
+    <function name="Indexubv" offset="316" deprecated="3.1">
         <param name="c" type="const GLubyte *" count="1"/>
         <glx rop="194"/>
     </function>
@@ -4343,26 +4318,29 @@
     <enum name="DOT3_RGB"                                 value="0x86AE"/>
     <enum name="DOT3_RGBA"                                value="0x86AF"/>
 
-    <function name="ActiveTexture" alias="ActiveTextureARB" es1="1.0"
-              es2="2.0">
+    <function name="ActiveTexture" es1="1.0"
+              es2="2.0" offset="374">
         <param name="texture" type="GLenum"/>
+        <glx rop="197"/>
     </function>
 
-    <function name="ClientActiveTexture" alias="ClientActiveTextureARB"
-              es1="1.0" deprecated="3.1">
+    <function name="ClientActiveTexture"
+              es1="1.0" deprecated="3.1" offset="375">
         <param name="texture" type="GLenum"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1d"
+              deprecated="3.1" offset="376">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1dv"
+              deprecated="3.1" offset="377">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="1"/>
+        <glx rop="198"/>
     </function>
 
     <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB"
@@ -4377,41 +4355,44 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1i"
+              deprecated="3.1" offset="380">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1iv"
+              deprecated="3.1" offset="381">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *"/>
+        <param name="v" type="const GLint *" count="1"/>
+        <glx rop="200"/>
     </function>
 
-    <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1s"
+              deprecated="3.1" offset="382">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord1sv"
+              deprecated="3.1" offset="383">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="1"/>
+        <glx rop="201"/>
     </function>
 
-    <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2d"
+              deprecated="3.1" offset="384">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2dv"
+              deprecated="3.1" offset="385">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="2"/>
+        <glx rop="202"/>
     </function>
 
     <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB"
@@ -4427,44 +4408,47 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2i"
+              deprecated="3.1" offset="388">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2iv"
+              deprecated="3.1" offset="389">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *"/>
+        <param name="v" type="const GLint *" count="2"/>
+        <glx rop="204"/>
     </function>
 
-    <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2s"
+              deprecated="3.1" offset="390">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord2sv"
+              deprecated="3.1" offset="391">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="2"/>
+        <glx rop="205"/>
     </function>
 
-    <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3d"
+              deprecated="3.1" offset="392">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3dv"
+              deprecated="3.1" offset="393">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="3"/>
+        <glx rop="206"/>
     </function>
 
     <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB"
@@ -4481,36 +4465,38 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3i"
+              deprecated="3.1" offset="396">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3iv"
+              deprecated="3.1" offset="397">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *"/>
+        <param name="v" type="const GLint *" count="3"/>
+        <glx rop="208"/>
     </function>
 
-    <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3s"
+              deprecated="3.1" offset="398">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord3sv"
+              deprecated="3.1" offset="399">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="3"/>
+        <glx rop="209"/>
     </function>
 
-    <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4d"
+              deprecated="3.1" offset="400">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
@@ -4518,10 +4504,11 @@
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4dv"
+              deprecated="3.1" offset="401">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="4"/>
+        <glx rop="210"/>
     </function>
 
     <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0"
@@ -4539,8 +4526,8 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4i"
+              deprecated="3.1" offset="404">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
@@ -4548,14 +4535,15 @@
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4iv"
+              deprecated="3.1" offset="405">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *"/>
+        <param name="v" type="const GLint *" count="4"/>
+        <glx rop="212"/>
     </function>
 
-    <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4s"
+              deprecated="3.1" offset="406">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
@@ -4563,39 +4551,45 @@
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB"
-              deprecated="3.1">
+    <function name="MultiTexCoord4sv"
+              deprecated="3.1" offset="407">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="4"/>
+        <glx rop="213"/>
     </function>
 
-    <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB"
-              deprecated="3.1">
+    <function name="LoadTransposeMatrixf"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB"
-              deprecated="3.1">
+    <function name="LoadTransposeMatrixd"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB"
-              deprecated="3.1">
+    <function name="MultTransposeMatrixf"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB"
-              deprecated="3.1">
+    <function name="MultTransposeMatrixd"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="SampleCoverage" alias="SampleCoverageARB" es1="1.0"
-              es2="2.0">
+    <function name="SampleCoverage" es1="1.0"
+              es2="2.0" offset="assign">
         <param name="value" type="GLclampf"/>
         <param name="invert" type="GLboolean"/>
+        <glx rop="229"/>
     </function>
 
-    <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB" es2="3.0">
+    <function name="CompressedTexImage3D" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4603,33 +4597,36 @@
         <param name="height" type="GLsizei"/>
         <param name="depth" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="216" handcode="client"/>
     </function>
 
-    <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB"
-              es1="1.0" es2="2.0">
+    <function name="CompressedTexImage2D"
+              es1="1.0" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="215" handcode="client"/>
     </function>
 
-    <function name="CompressedTexImage1D" alias="CompressedTexImage1DARB">
+    <function name="CompressedTexImage1D" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="214" handcode="client"/>
     </function>
 
-    <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB" es2="3.0">
+    <function name="CompressedTexSubImage3D" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4639,12 +4636,13 @@
         <param name="height" type="GLsizei"/>
         <param name="depth" type="GLsizei"/>
         <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="219" handcode="client"/>
     </function>
 
-    <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB"
-              es1="1.0" es2="2.0">
+    <function name="CompressedTexSubImage2D"
+              es1="1.0" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4652,24 +4650,27 @@
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="218" handcode="client"/>
     </function>
 
-    <function name="CompressedTexSubImage1D" alias="CompressedTexSubImage1DARB">
+    <function name="CompressedTexSubImage1D" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
         <param name="width" type="GLsizei"/>
         <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="imageSize" type="GLsizei" counter="true"/>
+        <param name="data" type="const GLvoid *" count="imageSize"/>
+        <glx rop="217" handcode="client"/>
     </function>
 
-    <function name="GetCompressedTexImage" alias="GetCompressedTexImageARB">
+    <function name="GetCompressedTexImage" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="img" type="GLvoid *" output="true"/>
+        <glx sop="160" handcode="true"/>
     </function>
 </category>
 
@@ -4687,19 +4688,19 @@
         <size name="Get" mode="get"/>
     </enum>
     <enum name="POINT_SIZE_MIN"                count="1"  value="0x8126">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
         <size name="Get" mode="get"/>
     </enum>
     <enum name="POINT_SIZE_MAX"                count="1"  value="0x8127">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
         <size name="Get" mode="get"/>
     </enum>
     <enum name="POINT_FADE_THRESHOLD_SIZE"     count="1"  value="0x8128">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
         <size name="Get" mode="get"/>
     </enum>
     <enum name="POINT_DISTANCE_ATTENUATION"    count="3"  value="0x8129">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
         <size name="Get" mode="get"/>
     </enum>
     <enum name="GENERATE_MIPMAP"               count="1"  value="0x8191">
@@ -4788,11 +4789,12 @@
     </enum>
     <enum name="COMPARE_R_TO_TEXTURE"                     value="0x884E"/>
 
-    <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT" es2="2.0">
+    <function name="BlendFuncSeparate" es2="2.0" offset="assign">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
         <param name="sfactorAlpha" type="GLenum"/>
         <param name="dfactorAlpha" type="GLenum"/>
+        <glx rop="4134"/>
     </function>
 
     <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1">
@@ -4803,26 +4805,29 @@
         <param name="coord" type="const GLfloat *"/>
     </function>
 
-    <function name="FogCoordd" alias="FogCoorddEXT" deprecated="3.1">
+    <function name="FogCoordd" deprecated="3.1" offset="assign">
         <param name="coord" type="GLdouble"/>
     </function>
 
-    <function name="FogCoorddv" alias="FogCoorddvEXT" deprecated="3.1">
-        <param name="coord" type="const GLdouble *"/>
+    <function name="FogCoorddv" deprecated="3.1" offset="assign">
+        <param name="coord" type="const GLdouble *" count="1"/>
+        <glx rop="4125"/>
     </function>
 
-    <function name="FogCoordPointer" alias="FogCoordPointerEXT"
-              deprecated="3.1">
+    <function name="FogCoordPointer"
+              deprecated="3.1" offset="assign">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultiDrawArrays" alias="MultiDrawArraysEXT">
+    <function name="MultiDrawArrays" offset="assign">
         <param name="mode" type="GLenum"/>
         <param name="first" type="const GLint *"/>
         <param name="count" type="const GLsizei *"/>
         <param name="primcount" type="GLsizei"/>
+        <glx handcode="true"/>
     </function>
 
     <function name="MultiDrawElements" alias="MultiDrawElementsEXT">
@@ -4833,48 +4838,54 @@
         <param name="primcount" type="GLsizei"/>
     </function>
 
-    <function name="PointParameterf" alias="PointParameterfEXT" es1="1.1">
+    <function name="PointParameterf" es1="1.1" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
+        <glx rop="2065"/>
     </function>
 
-    <function name="PointParameterfv" alias="PointParameterfvEXT" es1="1.1">
+    <function name="PointParameterfv" es1="1.1" offset="assign">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfloat *"/>
+        <param name="params" type="const GLfloat *" variable_param="pname"/>
+        <glx rop="2066"/>
     </function>
 
-    <function name="PointParameteri" alias="PointParameteriNV">
+    <function name="PointParameteri" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
+        <glx rop="4221"/>
     </function>
 
-    <function name="PointParameteriv" alias="PointParameterivNV">
+    <function name="PointParameteriv" offset="assign">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLint *"/>
+        <param name="params" type="const GLint *" variable_param="pname"/>
+        <glx rop="4222"/>
     </function>
 
-    <function name="SecondaryColor3b" alias="SecondaryColor3bEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3b"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLbyte *"/>
+    <function name="SecondaryColor3bv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLbyte *" count="3"/>
+        <glx rop="4126"/>
     </function>
 
-    <function name="SecondaryColor3d" alias="SecondaryColor3dEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3d"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLdouble *"/>
+    <function name="SecondaryColor3dv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLdouble *" count="3"/>
+        <glx rop="4130"/>
     </function>
 
     <function name="SecondaryColor3f" alias="SecondaryColor3fEXT"
@@ -4889,148 +4900,169 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="SecondaryColor3i" alias="SecondaryColor3iEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3i"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLint *"/>
+    <function name="SecondaryColor3iv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLint *" count="3"/>
+        <glx rop="4128"/>
     </function>
 
-    <function name="SecondaryColor3s" alias="SecondaryColor3sEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3s"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLshort *"/>
+    <function name="SecondaryColor3sv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLshort *" count="3"/>
+        <glx rop="4127"/>
     </function>
 
-    <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3ub"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLubyte *"/>
+    <function name="SecondaryColor3ubv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLubyte *" count="3"/>
+        <glx rop="4131"/>
     </function>
 
-    <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3ui"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLuint *"/>
+    <function name="SecondaryColor3uiv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLuint *" count="3"/>
+        <glx rop="4133"/>
     </function>
 
-    <function name="SecondaryColor3us" alias="SecondaryColor3usEXT"
-              deprecated="3.1">
+    <function name="SecondaryColor3us"
+              deprecated="3.1" offset="assign">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT"
-              deprecated="3.1">
-        <param name="v" type="const GLushort *"/>
+    <function name="SecondaryColor3usv"
+              deprecated="3.1" offset="assign">
+        <param name="v" type="const GLushort *" count="3"/>
+        <glx rop="4132"/>
     </function>
 
-    <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT"
-              deprecated="3.1">
+    <function name="SecondaryColorPointer"
+              deprecated="3.1" offset="assign">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2d" alias="WindowPos2dMESA" deprecated="3.1">
+    <function name="WindowPos2d" deprecated="3.1" offset="assign">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2dv" alias="WindowPos2dvMESA" deprecated="3.1">
+    <function name="WindowPos2dv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2f" alias="WindowPos2fMESA" deprecated="3.1">
+    <function name="WindowPos2f" deprecated="3.1" offset="assign">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2fv" alias="WindowPos2fvMESA" deprecated="3.1">
+    <function name="WindowPos2fv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2i" alias="WindowPos2iMESA" deprecated="3.1">
+    <function name="WindowPos2i" deprecated="3.1" offset="assign">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2iv" alias="WindowPos2ivMESA" deprecated="3.1">
+    <function name="WindowPos2iv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLint *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2s" alias="WindowPos2sMESA" deprecated="3.1">
+    <function name="WindowPos2s" deprecated="3.1" offset="assign">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2sv" alias="WindowPos2svMESA" deprecated="3.1">
+    <function name="WindowPos2sv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLshort *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3d" alias="WindowPos3dMESA" deprecated="3.1">
+    <function name="WindowPos3d" deprecated="3.1" offset="assign">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3dv" alias="WindowPos3dvMESA" deprecated="3.1">
+    <function name="WindowPos3dv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3f" alias="WindowPos3fMESA" deprecated="3.1">
+    <function name="WindowPos3f" deprecated="3.1" offset="assign">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="WindowPos3fv" alias="WindowPos3fvMESA" deprecated="3.1">
-        <param name="v" type="const GLfloat *"/>
+    <function name="WindowPos3fv" deprecated="3.1" offset="assign">
+        <param name="v" type="const GLfloat *" count="3"/>
+        <glx rop="230"/>
     </function>
 
-    <function name="WindowPos3i" alias="WindowPos3iMESA" deprecated="3.1">
+    <function name="WindowPos3i" deprecated="3.1" offset="assign">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3iv" alias="WindowPos3ivMESA" deprecated="3.1">
+    <function name="WindowPos3iv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLint *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3s" alias="WindowPos3sMESA" deprecated="3.1">
+    <function name="WindowPos3s" deprecated="3.1" offset="assign">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3sv" alias="WindowPos3svMESA" deprecated="3.1">
+    <function name="WindowPos3sv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLshort *"/>
+        <glx handcode="true"/>
     </function>
 </category>
 
@@ -5099,113 +5131,132 @@
     <type name="intptr"   size="4"                  glx_name="CARD32"/>
     <type name="sizeiptr" size="4"  unsigned="true" glx_name="CARD32"/>
 
-    <function name="BindBuffer" alias="BindBufferARB" es1="1.1" es2="2.0">
+    <function name="BindBuffer" es1="1.1" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="buffer" type="GLuint"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="BufferData" alias="BufferDataARB" es1="1.1" es2="2.0">
+    <function name="BufferData" es1="1.1" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
-        <param name="size" type="GLsizeiptr"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="size" type="GLsizeiptr" counter="true"/>
+        <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/>
         <param name="usage" type="GLenum"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="BufferSubData" alias="BufferSubDataARB" es1="1.1"
-              es2="2.0">
+    <function name="BufferSubData" es1="1.1"
+              es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
-        <param name="size" type="GLsizeiptr"/>
-        <param name="data" type="const GLvoid *"/>
+        <param name="size" type="GLsizeiptr" counter="true"/>
+        <param name="data" type="const GLvoid *" count="size"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="DeleteBuffers" alias="DeleteBuffersARB" es1="1.1"
-              es2="2.0">
-        <param name="n" type="GLsizei"/>
-        <param name="buffer" type="const GLuint *"/>
+    <function name="DeleteBuffers" es1="1.1"
+              es2="2.0" offset="assign">
+        <param name="n" type="GLsizei" counter="true"/>
+        <param name="buffer" type="const GLuint *" count="n"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GenBuffers" alias="GenBuffersARB" es1="1.1" es2="2.0">
+    <function name="GenBuffers" es1="1.1" es2="2.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="buffer" type="GLuint *" output="true" count="n"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetBufferParameteriv" alias="GetBufferParameterivARB"
-              es1="1.1" es2="2.0">
+    <function name="GetBufferParameteriv"
+              es1="1.1" es2="2.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetBufferPointerv" alias="GetBufferPointervARB" es2="3.0">
+    <function name="GetBufferPointerv" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **" output="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetBufferSubData" alias="GetBufferSubDataARB">
+    <function name="GetBufferSubData" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
-        <param name="size" type="GLsizeiptr"/>
-        <param name="data" type="GLvoid *" output="true"/>
+        <param name="size" type="GLsizeiptr" counter="true"/>
+        <param name="data" type="GLvoid *" output="true" count="size"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="IsBuffer" alias="IsBufferARB" es1="1.1" es2="2.0">
+    <function name="IsBuffer" es1="1.1" es2="2.0" offset="assign">
         <param name="buffer" type="GLuint"/>
         <return type="GLboolean"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="MapBuffer" alias="MapBufferARB">
+    <function name="MapBuffer" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="access" type="GLenum"/>
         <return type="GLvoid *"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="UnmapBuffer" alias="UnmapBufferARB" es2="3.0">
+    <function name="UnmapBuffer" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <return type="GLboolean"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GenQueries" alias="GenQueriesARB" es2="3.0">
+    <function name="GenQueries" es2="3.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="ids" type="GLuint *" output="true" count="n"/>
+        <glx sop="162" always_array="true"/>
     </function>
 
-    <function name="DeleteQueries" alias="DeleteQueriesARB" es2="3.0">
-        <param name="n" type="GLsizei"/>
-        <param name="ids" type="const GLuint *"/>
+    <function name="DeleteQueries" es2="3.0" offset="assign">
+        <param name="n" type="GLsizei" counter="true"/>
+        <param name="ids" type="const GLuint *" count="n"/>
+        <glx sop="161"/>
     </function>
 
-    <function name="IsQuery" alias="IsQueryARB" es2="3.0">
+    <function name="IsQuery" es2="3.0" offset="assign">
         <param name="id" type="GLuint"/>
         <return type="GLboolean"/>
+        <glx sop="163"/>
     </function>
 
-    <function name="BeginQuery" alias="BeginQueryARB" es2="3.0">
+    <function name="BeginQuery" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="id" type="GLuint"/>
+        <glx rop="231"/>
     </function>
 
-    <function name="EndQuery" alias="EndQueryARB" es2="3.0">
+    <function name="EndQuery" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
+        <glx rop="232"/>
     </function>
 
-    <function name="GetQueryiv" alias="GetQueryivARB" es2="3.0">
+    <function name="GetQueryiv" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
+        <glx sop="164"/>
     </function>
 
-    <function name="GetQueryObjectiv" alias="GetQueryObjectivARB">
+    <function name="GetQueryObjectiv" offset="assign">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
+        <glx sop="165"/>
     </function>
 
-    <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB" es2="3.0">
+    <function name="GetQueryObjectuiv" es2="3.0" offset="assign">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint *" output="true" variable_param="pname"/>
+        <glx sop="166"/>
     </function>
 </category>
 
@@ -5295,8 +5346,8 @@
     <enum name="SHADING_LANGUAGE_VERSION"         value="0x8B8C"/>
     <enum name="CURRENT_PROGRAM"                  value="0x8B8D"/>
     <enum name="POINT_SPRITE_COORD_ORIGIN" count="1"  value="0x8CA0">
-        <size name="PointParameterfvEXT"/>
-        <size name="PointParameterivNV"/>
+        <size name="PointParameterfv"/>
+        <size name="PointParameteriv"/>
     </enum>
     <enum name="LOWER_LEFT"                       value="0x8CA1"/>
     <enum name="UPPER_LEFT"                       value="0x8CA2"/>
@@ -5304,15 +5355,17 @@
     <enum name="STENCIL_BACK_VALUE_MASK"          value="0x8CA4"/>
     <enum name="STENCIL_BACK_WRITEMASK"           value="0x8CA5"/>
 
-    <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT"
-              es2="2.0">
+    <function name="BlendEquationSeparate"
+              es2="2.0" offset="assign">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
+        <glx rop="4228"/>
     </function>
 
-    <function name="DrawBuffers" alias="DrawBuffersARB" es2="3.0">
+    <function name="DrawBuffers" es2="3.0" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="bufs" type="const GLenum *" count="n"/>
+        <glx rop="233" large="true"/>
     </function>
 
     <function name="StencilFuncSeparate" offset="assign" es2="2.0">
@@ -5343,17 +5396,19 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="BindAttribLocation" alias="BindAttribLocationARB"
-              es2="2.0">
+    <function name="BindAttribLocation"
+              es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="CompileShader" alias="CompileShaderARB" es2="2.0">
+    <function name="CompileShader" es2="2.0" offset="assign">
         <param name="shader" type="GLuint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
     <function name="CreateProgram" offset="assign" es2="2.0">
@@ -5383,19 +5438,20 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="DisableVertexAttribArray"
-              alias="DisableVertexAttribArrayARB" es2="2.0">
+    <function name="DisableVertexAttribArray" es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <glx ignore="true"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB"
-              es2="2.0">
+    <function name="EnableVertexAttribArray"
+              es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <glx ignore="true"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="GetActiveAttrib" alias="GetActiveAttribARB" es2="2.0">
+    <function name="GetActiveAttrib" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei "/>
@@ -5404,9 +5460,10 @@
         <param name="type" type="GLenum *" output="true"/>
         <param name="name" type="GLchar *" output="true"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetActiveUniform" alias="GetActiveUniformARB" es2="2.0">
+    <function name="GetActiveUniform" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
@@ -5415,6 +5472,7 @@
         <param name="type" type="GLenum *" output="true"/>
         <param name="name" type="GLchar *" output="true"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
     <function name="GetAttachedShaders" offset="assign" es2="2.0">
@@ -5425,11 +5483,12 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetAttribLocation" alias="GetAttribLocationARB" es2="2.0">
+    <function name="GetAttribLocation" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
     <function name="GetProgramiv" offset="assign" es2="2.0">
@@ -5462,63 +5521,71 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetShaderSource" alias="GetShaderSourceARB" es2="2.0">
+    <function name="GetShaderSource" es2="2.0" offset="assign">
         <param name="shader" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *" output="true"/>
         <param name="source" type="GLchar *" output="true"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformLocation" alias="GetUniformLocationARB"
-              es2="2.0">
+    <function name="GetUniformLocation"
+              es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformfv" alias="GetUniformfvARB" es2="2.0">
+    <function name="GetUniformfv" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLfloat *" output="true"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformiv" alias="GetUniformivARB" es2="2.0">
+    <function name="GetUniformiv" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
-        <param name="params" type="GLint *"/>
+        <param name="params" type="GLint *" output="true"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetVertexAttribdv" alias="GetVertexAttribdvARB">
+    <function name="GetVertexAttribdv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLdouble *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
+        <glx handcode="client" vendorpriv="1301"/>
     </function>
 
-    <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB" es2="2.0">
+    <function name="GetVertexAttribfv" es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
+        <glx handcode="client" vendorpriv="1302"/>
     </function>
 
-    <function name="GetVertexAttribiv" alias="GetVertexAttribivARB" es2="2.0">
+    <function name="GetVertexAttribiv" es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
+        <glx handcode="client" vendorpriv="1303"/>
     </function>
 
-    <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV"
-              es2="2.0">
+    <function name="GetVertexAttribPointerv"
+              es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="pointer" type="GLvoid **" output="true"/>
         <glx ignore="true"/>
+        <glx handcode="true"/>
     </function>
 
     <function name="IsProgram" offset="assign" es2="2.0">
@@ -5533,162 +5600,186 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="LinkProgram" alias="LinkProgramARB" es2="2.0">
+    <function name="LinkProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="ShaderSource" alias="ShaderSourceARB" es2="2.0">
+    <function name="ShaderSource" es2="2.0" offset="assign">
         <param name="shader" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="string" type="const GLchar * const *"/>
         <param name="length" type="const GLint *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="UseProgram" alias="UseProgramObjectARB" es2="2.0">
+    <function name="UseProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1f" alias="Uniform1fARB" es2="2.0">
+    <function name="Uniform1f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform2f" alias="Uniform2fARB" es2="2.0">
+    <function name="Uniform2f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform3f" alias="Uniform3fARB" es2="2.0">
+    <function name="Uniform3f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <param name="v2" type="GLfloat"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform4f" alias="Uniform4fARB" es2="2.0">
+    <function name="Uniform4f" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <param name="v2" type="GLfloat"/>
         <param name="v3" type="GLfloat"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1i" alias="Uniform1iARB" es2="2.0">
+    <function name="Uniform1i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform2i" alias="Uniform2iARB" es2="2.0">
+    <function name="Uniform2i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform3i" alias="Uniform3iARB" es2="2.0">
+    <function name="Uniform3i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <param name="v2" type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform4i" alias="Uniform4iARB" es2="2.0">
+    <function name="Uniform4i" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <param name="v2" type="GLint"/>
         <param name="v3" type="GLint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1fv" alias="Uniform1fvARB" es2="2.0">
+    <function name="Uniform1fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform2fv" alias="Uniform2fvARB" es2="2.0">
+    <function name="Uniform2fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform3fv" alias="Uniform3fvARB" es2="2.0">
+    <function name="Uniform3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform4fv" alias="Uniform4fvARB" es2="2.0">
+    <function name="Uniform4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1iv" alias="Uniform1ivARB" es2="2.0">
+    <function name="Uniform1iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform2iv" alias="Uniform2ivARB" es2="2.0">
+    <function name="Uniform2iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform3iv" alias="Uniform3ivARB" es2="2.0">
+    <function name="Uniform3iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="Uniform4iv" alias="Uniform4ivARB" es2="2.0">
+    <function name="Uniform4iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB" es2="2.0">
+    <function name="UniformMatrix2fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB" es2="2.0">
+    <function name="UniformMatrix3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB" es2="2.0">
+    <function name="UniformMatrix4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="ValidateProgram" alias="ValidateProgramARB" es2="2.0">
+    <function name="ValidateProgram" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
+        <glx ignore="true"/>
     </function>
 
-    <function name="VertexAttrib1d" alias="VertexAttrib1dARB">
+    <function name="VertexAttrib1d" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib1dv" alias="VertexAttrib1dvARB">
+    <function name="VertexAttrib1dv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="1"/>
+        <glx rop="4197" doubles_in_order="true"/>
     </function>
     <function name="VertexAttrib1f" alias="VertexAttrib1fARB" es2="2.0">
         <param name="index" type="GLuint"/>
@@ -5698,23 +5789,25 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib1s" alias="VertexAttrib1sARB">
+    <function name="VertexAttrib1s" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
-    <function name="VertexAttrib1sv" alias="VertexAttrib1svARB">
+    <function name="VertexAttrib1sv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="1"/>
+        <glx rop="4189"/>
     </function>
 
-    <function name="VertexAttrib2d" alias="VertexAttrib2dARB">
+    <function name="VertexAttrib2d" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib2dv" alias="VertexAttrib2dvARB">
+    <function name="VertexAttrib2dv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="2"/>
+        <glx rop="4198" doubles_in_order="true"/>
     </function>
     <function name="VertexAttrib2f" alias="VertexAttrib2fARB" es2="2.0">
         <param name="index" type="GLuint"/>
@@ -5725,25 +5818,27 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib2s" alias="VertexAttrib2sARB">
+    <function name="VertexAttrib2s" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
-    <function name="VertexAttrib2sv" alias="VertexAttrib2svARB">
+    <function name="VertexAttrib2sv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="2"/>
+        <glx rop="4190"/>
     </function>
 
-    <function name="VertexAttrib3d" alias="VertexAttrib3dARB">
+    <function name="VertexAttrib3d" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib3dv" alias="VertexAttrib3dvARB">
+    <function name="VertexAttrib3dv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="3"/>
+        <glx rop="4199" doubles_in_order="true"/>
     </function>
     <function name="VertexAttrib3f" alias="VertexAttrib3fARB" es2="2.0">
         <param name="index" type="GLuint"/>
@@ -5755,62 +5850,71 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib3s" alias="VertexAttrib3sARB">
+    <function name="VertexAttrib3s" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
-    <function name="VertexAttrib3sv" alias="VertexAttrib3svARB">
+    <function name="VertexAttrib3sv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="3"/>
+        <glx rop="4191"/>
     </function>
 
-    <function name="VertexAttrib4Nbv" alias="VertexAttrib4NbvARB">
+    <function name="VertexAttrib4Nbv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLbyte *"/>
+        <param name="v" type="const GLbyte *" count="4"/>
+        <glx rop="4235"/>
     </function>
-    <function name="VertexAttrib4Niv" alias="VertexAttrib4NivARB">
+    <function name="VertexAttrib4Niv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLint *"/>
+        <param name="v" type="const GLint *" count="4"/>
+        <glx rop="4237"/>
     </function>
-    <function name="VertexAttrib4Nsv" alias="VertexAttrib4NsvARB">
+    <function name="VertexAttrib4Nsv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="4"/>
+        <glx rop="4236"/>
     </function>
-    <function name="VertexAttrib4Nub" alias="VertexAttrib4NubARB">
+    <function name="VertexAttrib4Nub" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
         <param name="z" type="GLubyte"/>
         <param name="w" type="GLubyte"/>
     </function>
-    <function name="VertexAttrib4Nubv" alias="VertexAttrib4NubvARB">
+    <function name="VertexAttrib4Nubv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLubyte *"/>
+        <param name="v" type="const GLubyte *" count="4"/>
+        <glx rop="4201"/>
     </function>
-    <function name="VertexAttrib4Nuiv" alias="VertexAttrib4NuivARB">
+    <function name="VertexAttrib4Nuiv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLuint *"/>
+        <param name="v" type="const GLuint *" count="4"/>
+        <glx rop="4239"/>
     </function>
-    <function name="VertexAttrib4Nusv" alias="VertexAttrib4NusvARB">
+    <function name="VertexAttrib4Nusv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLushort *"/>
+        <param name="v" type="const GLushort *" count="4"/>
+        <glx rop="4238"/>
     </function>
-    <function name="VertexAttrib4bv" alias="VertexAttrib4bvARB">
+    <function name="VertexAttrib4bv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *" count="4"/>
+        <glx rop="4230"/>
     </function>
-    <function name="VertexAttrib4d" alias="VertexAttrib4dARB">
+    <function name="VertexAttrib4d" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <param name="w" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib4dv" alias="VertexAttrib4dvARB">
+    <function name="VertexAttrib4dv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *"/>
+        <param name="v" type="const GLdouble *" count="4"/>
+        <glx rop="4200" doubles_in_order="true"/>
     </function>
     <function name="VertexAttrib4f" alias="VertexAttrib4fARB" es2="2.0">
         <param name="index" type="GLuint"/>
@@ -5823,42 +5927,48 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib4iv" alias="VertexAttrib4ivARB">
+    <function name="VertexAttrib4iv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="4"/>
+        <glx rop="4231"/>
     </function>
-    <function name="VertexAttrib4s" alias="VertexAttrib4sARB">
+    <function name="VertexAttrib4s" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
         <param name="w" type="GLshort"/>
     </function>
-    <function name="VertexAttrib4sv" alias="VertexAttrib4svARB">
+    <function name="VertexAttrib4sv" offset="assign">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *"/>
+        <param name="v" type="const GLshort *" count="4"/>
+        <glx rop="4192"/>
     </function>
-    <function name="VertexAttrib4ubv" alias="VertexAttrib4ubvARB">
+    <function name="VertexAttrib4ubv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *" count="4"/>
+        <glx rop="4232"/>
     </function>
-    <function name="VertexAttrib4uiv" alias="VertexAttrib4uivARB">
+    <function name="VertexAttrib4uiv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="4"/>
+        <glx rop="4234"/>
     </function>
-    <function name="VertexAttrib4usv" alias="VertexAttrib4usvARB">
+    <function name="VertexAttrib4usv" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLushort *" count="4"/>
+        <glx rop="4233"/>
     </function>
 
-    <function name="VertexAttribPointer" alias="VertexAttribPointerARB"
-              es2="2.0">
+    <function name="VertexAttribPointer"
+              es2="2.0" offset="assign">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
+        <glx handcode="true"/>
     </function>
 
 </category>
@@ -5983,26 +6093,23 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="ActiveTextureARB" offset="374">
+    <function name="ActiveTextureARB" alias="ActiveTexture">
         <param name="texture" type="GLenum"/>
-        <glx rop="197"/>
     </function>
 
-    <function name="ClientActiveTextureARB" offset="375">
+    <function name="ClientActiveTextureARB" alias="ClientActiveTexture">
         <param name="texture" type="GLenum"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="MultiTexCoord1dARB" offset="376"
-              vectorequiv="MultiTexCoord1dvARB" exec="loopback">
+    <function name="MultiTexCoord1dARB"
+              vectorequiv="MultiTexCoord1dv" alias="MultiTexCoord1d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord1dvARB" offset="377" exec="loopback">
+    <function name="MultiTexCoord1dvARB" alias="MultiTexCoord1dv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *" count="1"/>
-        <glx rop="198"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="MultiTexCoord1fARB" offset="378"
@@ -6017,41 +6124,38 @@
         <glx rop="199"/>
     </function>
 
-    <function name="MultiTexCoord1iARB" offset="380"
-              vectorequiv="MultiTexCoord1ivARB" exec="loopback">
+    <function name="MultiTexCoord1iARB"
+              vectorequiv="MultiTexCoord1iv" alias="MultiTexCoord1i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord1ivARB" offset="381" exec="loopback">
+    <function name="MultiTexCoord1ivARB" alias="MultiTexCoord1iv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *" count="1"/>
-        <glx rop="200"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="MultiTexCoord1sARB" offset="382"
-              vectorequiv="MultiTexCoord1svARB" exec="loopback">
+    <function name="MultiTexCoord1sARB"
+              vectorequiv="MultiTexCoord1sv" alias="MultiTexCoord1s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord1svARB" offset="383" exec="loopback">
+    <function name="MultiTexCoord1svARB" alias="MultiTexCoord1sv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *" count="1"/>
-        <glx rop="201"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="MultiTexCoord2dARB" offset="384"
-              vectorequiv="MultiTexCoord2dvARB" exec="loopback">
+    <function name="MultiTexCoord2dARB"
+              vectorequiv="MultiTexCoord2dv" alias="MultiTexCoord2d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord2dvARB" offset="385" exec="loopback">
+    <function name="MultiTexCoord2dvARB" alias="MultiTexCoord2dv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *" count="2"/>
-        <glx rop="202"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="MultiTexCoord2fARB" offset="386"
@@ -6067,44 +6171,41 @@
         <glx rop="203"/>
     </function>
 
-    <function name="MultiTexCoord2iARB" offset="388"
-              vectorequiv="MultiTexCoord2ivARB" exec="loopback">
+    <function name="MultiTexCoord2iARB"
+              vectorequiv="MultiTexCoord2iv" alias="MultiTexCoord2i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord2ivARB" offset="389" exec="loopback">
+    <function name="MultiTexCoord2ivARB" alias="MultiTexCoord2iv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *" count="2"/>
-        <glx rop="204"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="MultiTexCoord2sARB" offset="390"
-              vectorequiv="MultiTexCoord2svARB" exec="loopback">
+    <function name="MultiTexCoord2sARB"
+              vectorequiv="MultiTexCoord2sv" alias="MultiTexCoord2s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord2svARB" offset="391" exec="loopback">
+    <function name="MultiTexCoord2svARB" alias="MultiTexCoord2sv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *" count="2"/>
-        <glx rop="205"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="MultiTexCoord3dARB" offset="392"
-              vectorequiv="MultiTexCoord3dvARB" exec="loopback">
+    <function name="MultiTexCoord3dARB"
+              vectorequiv="MultiTexCoord3dv" alias="MultiTexCoord3d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord3dvARB" offset="393" exec="loopback">
+    <function name="MultiTexCoord3dvARB" alias="MultiTexCoord3dv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *" count="3"/>
-        <glx rop="206"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="MultiTexCoord3fARB" offset="394"
@@ -6121,36 +6222,34 @@
         <glx rop="207"/>
     </function>
 
-    <function name="MultiTexCoord3iARB" offset="396"
-              vectorequiv="MultiTexCoord3ivARB" exec="loopback">
+    <function name="MultiTexCoord3iARB"
+              vectorequiv="MultiTexCoord3iv" alias="MultiTexCoord3i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord3ivARB" offset="397" exec="loopback">
+    <function name="MultiTexCoord3ivARB" alias="MultiTexCoord3iv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *" count="3"/>
-        <glx rop="208"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="MultiTexCoord3sARB" offset="398"
-              vectorequiv="MultiTexCoord3svARB" exec="loopback">
+    <function name="MultiTexCoord3sARB"
+              vectorequiv="MultiTexCoord3sv" alias="MultiTexCoord3s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord3svARB" offset="399" exec="loopback">
+    <function name="MultiTexCoord3svARB" alias="MultiTexCoord3sv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *" count="3"/>
-        <glx rop="209"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="MultiTexCoord4dARB" offset="400"
-              vectorequiv="MultiTexCoord4dvARB" exec="loopback">
+    <function name="MultiTexCoord4dARB"
+              vectorequiv="MultiTexCoord4dv" alias="MultiTexCoord4d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
@@ -6158,10 +6257,9 @@
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord4dvARB" offset="401" exec="loopback">
+    <function name="MultiTexCoord4dvARB" alias="MultiTexCoord4dv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLdouble *" count="4"/>
-        <glx rop="210"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="MultiTexCoord4fARB" offset="402"
@@ -6179,8 +6277,8 @@
         <glx rop="211"/>
     </function>
 
-    <function name="MultiTexCoord4iARB" offset="404"
-              vectorequiv="MultiTexCoord4ivARB" exec="loopback">
+    <function name="MultiTexCoord4iARB"
+              vectorequiv="MultiTexCoord4iv" alias="MultiTexCoord4i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
@@ -6188,14 +6286,13 @@
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord4ivARB" offset="405" exec="loopback">
+    <function name="MultiTexCoord4ivARB" alias="MultiTexCoord4iv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLint *" count="4"/>
-        <glx rop="212"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="MultiTexCoord4sARB" offset="406"
-              vectorequiv="MultiTexCoord4svARB" exec="loopback">
+    <function name="MultiTexCoord4sARB"
+              vectorequiv="MultiTexCoord4sv" alias="MultiTexCoord4s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
@@ -6203,10 +6300,9 @@
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord4svARB" offset="407" exec="loopback">
+    <function name="MultiTexCoord4svARB" alias="MultiTexCoord4sv">
         <param name="target" type="GLenum"/>
-        <param name="v" type="const GLshort *" count="4"/>
-        <glx rop="213"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 </category>
 
@@ -6218,24 +6314,20 @@
     <enum name="TRANSPOSE_TEXTURE_MATRIX_ARB"             value="0x84E5"/>
     <enum name="TRANSPOSE_COLOR_MATRIX_ARB"               value="0x84E6"/>
 
-    <function name="LoadTransposeMatrixfARB" offset="assign">
+    <function name="LoadTransposeMatrixfARB" alias="LoadTransposeMatrixf">
         <param name="m" type="const GLfloat *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="LoadTransposeMatrixdARB" offset="assign">
+    <function name="LoadTransposeMatrixdARB" alias="LoadTransposeMatrixd">
         <param name="m" type="const GLdouble *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixfARB" offset="assign">
+    <function name="MultTransposeMatrixfARB" alias="MultTransposeMatrixf">
         <param name="m" type="const GLfloat *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixdARB" offset="assign">
+    <function name="MultTransposeMatrixdARB" alias="MultTransposeMatrixd">
         <param name="m" type="const GLdouble *"/>
-        <glx handcode="true"/>
     </function>
 </category>
 
@@ -6268,10 +6360,9 @@
     </enum>
     <enum name="MULTISAMPLE_BIT_ARB"                      value="0x20000000"/>
 
-    <function name="SampleCoverageARB" offset="assign">
+    <function name="SampleCoverageARB" alias="SampleCoverage">
         <param name="value" type="GLclampf"/>
         <param name="invert" type="GLboolean"/>
-        <glx rop="229"/>
     </function>
 </category>
 
@@ -6328,7 +6419,7 @@
     </enum>
     <enum name="TEXTURE_COMPRESSED_FORMATS_ARB"           value="0x86A3"/>
 
-    <function name="CompressedTexImage3DARB" offset="assign">
+    <function name="CompressedTexImage3DARB" alias="CompressedTexImage3D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -6336,35 +6427,32 @@
         <param name="height" type="GLsizei"/>
         <param name="depth" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="216" handcode="client"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexImage2DARB" offset="assign">
+    <function name="CompressedTexImage2DARB" alias="CompressedTexImage2D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="215" handcode="client"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexImage1DARB" offset="assign">
+    <function name="CompressedTexImage1DARB" alias="CompressedTexImage1D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="border" type="GLint"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="214" handcode="client"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexSubImage3DARB" offset="assign">
+    <function name="CompressedTexSubImage3DARB" alias="CompressedTexSubImage3D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -6372,14 +6460,13 @@
         <param name="zoffset" type="GLint"/>
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
-        <param name="depth" type="GLsizei"/>
-        <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="219" handcode="client"/>
+        <param name="depth" type="GLsizei"/>
+        <param name="format" type="GLenum"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexSubImage2DARB" offset="assign">
+    <function name="CompressedTexSubImage2DARB" alias="CompressedTexSubImage2D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -6387,33 +6474,30 @@
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="218" handcode="client"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexSubImage1DARB" offset="assign">
+    <function name="CompressedTexSubImage1DARB" alias="CompressedTexSubImage1D">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
         <param name="width" type="GLsizei"/>
         <param name="format" type="GLenum"/>
-        <param name="imageSize" type="GLsizei" counter="true"/>
-        <param name="data" type="const GLvoid *" count="imageSize"/>
-        <glx rop="217" handcode="client"/>
+        <param name="imageSize" type="GLsizei"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="GetCompressedTexImageARB" offset="assign">
+    <function name="GetCompressedTexImageARB" alias="GetCompressedTexImage">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
-        <param name="img" type="GLvoid *" output="true"/>
+        <param name="img" type="GLvoid *"/>
 
         <!-- This has to be hand coded because the image size is in the
              "wrong" place.  Technically, this should be a
              'always_array="true"' case.  The size field in the reply would
              be at offset 12.  However, the size is actually at offset 16.
              This is where the 'width' is in a GetTexImage reply. -->
-        <glx sop="160" handcode="true"/>
     </function>
 </category>
 
@@ -6423,25 +6507,25 @@
 
 <category name="GL_ARB_point_parameters" number="14">
     <enum name="POINT_SIZE_MIN_ARB"            count="1"  value="0x8126">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_SIZE_MAX_ARB"            count="1"  value="0x8127">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_FADE_THRESHOLD_SIZE_ARB" count="1"  value="0x8128">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_DISTANCE_ATTENUATION_ARB" count="3" value="0x8129">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
 
-    <function name="PointParameterfARB" alias="PointParameterfEXT">
+    <function name="PointParameterfARB" alias="PointParameterf">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="2065"/>
     </function>
 
-    <function name="PointParameterfvARB" alias="PointParameterfvEXT">
+    <function name="PointParameterfvARB" alias="PointParameterfv">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="2066"/>
@@ -6771,79 +6855,79 @@
 </category>
 
 <category name="GL_ARB_window_pos" number="25">
-    <function name="WindowPos2dARB" alias="WindowPos2dMESA">
+    <function name="WindowPos2dARB" alias="WindowPos2d">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="WindowPos2fARB" alias="WindowPos2fMESA">
+    <function name="WindowPos2fARB" alias="WindowPos2f">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="WindowPos2iARB" alias="WindowPos2iMESA">
+    <function name="WindowPos2iARB" alias="WindowPos2i">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="WindowPos2sARB" alias="WindowPos2sMESA">
+    <function name="WindowPos2sARB" alias="WindowPos2s">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="WindowPos2dvARB" alias="WindowPos2dvMESA">
+    <function name="WindowPos2dvARB" alias="WindowPos2dv">
         <param name="v" type="const GLdouble *"/>
     </function>
 
-    <function name="WindowPos2fvARB" alias="WindowPos2fvMESA">
+    <function name="WindowPos2fvARB" alias="WindowPos2fv">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="WindowPos2ivARB" alias="WindowPos2ivMESA">
+    <function name="WindowPos2ivARB" alias="WindowPos2iv">
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="WindowPos2svARB" alias="WindowPos2svMESA">
+    <function name="WindowPos2svARB" alias="WindowPos2sv">
         <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="WindowPos3dARB" alias="WindowPos3dMESA">
+    <function name="WindowPos3dARB" alias="WindowPos3d">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="WindowPos3fARB" alias="WindowPos3fMESA">
+    <function name="WindowPos3fARB" alias="WindowPos3f">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="WindowPos3iARB" alias="WindowPos3iMESA">
+    <function name="WindowPos3iARB" alias="WindowPos3i">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="WindowPos3sARB" alias="WindowPos3sMESA">
+    <function name="WindowPos3sARB" alias="WindowPos3s">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="WindowPos3dvARB" alias="WindowPos3dvMESA">
+    <function name="WindowPos3dvARB" alias="WindowPos3dv">
         <param name="v" type="const GLdouble *"/>
     </function>
 
-    <function name="WindowPos3fvARB" alias="WindowPos3fvMESA">
+    <function name="WindowPos3fvARB" alias="WindowPos3fv">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="WindowPos3ivARB" alias="WindowPos3ivMESA">
+    <function name="WindowPos3ivARB" alias="WindowPos3iv">
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="WindowPos3svARB" alias="WindowPos3svMESA">
+    <function name="WindowPos3svARB" alias="WindowPos3sv">
         <param name="v" type="const GLshort *"/>
     </function>
 </category>
@@ -6853,35 +6937,35 @@
         <size name="Get" mode="get"/>
     </enum>
     <enum name="VERTEX_PROGRAM_ARB"            count="1"  value="0x8620">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
         <size name="Get" mode="get"/>
     </enum>
     <enum name="VERTEX_ATTRIB_ARRAY_ENABLED_ARB" count="1" value="0x8622">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="VERTEX_ATTRIB_ARRAY_SIZE_ARB"  count="1"  value="0x8623">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="VERTEX_ATTRIB_ARRAY_STRIDE_ARB" count="1" value="0x8624">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="VERTEX_ATTRIB_ARRAY_TYPE_ARB"  count="1"  value="0x8625">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="CURRENT_VERTEX_ATTRIB_ARB"     count="1"  value="0x8626">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="PROGRAM_LENGTH_ARB"            count="1"  value="0x8627">
         <size name="GetProgramivARB" mode="get"/>
@@ -7026,37 +7110,33 @@
     <enum name="MATRIX30_ARB"                             value="0x88DE"/>
     <enum name="MATRIX31_ARB"                             value="0x88DF"/>
 
-    <function name="GetVertexAttribdvARB" offset="assign">
+    <function name="GetVertexAttribdvARB" alias="GetVertexAttribdv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLdouble *" output="true" variable_param="pname"/>
-        <glx handcode="client" vendorpriv="1301"/>
+        <param name="params" type="GLdouble *"/>
     </function>
 
-    <function name="GetVertexAttribfvARB" offset="assign">
+    <function name="GetVertexAttribfvARB" alias="GetVertexAttribfv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
-        <glx handcode="client" vendorpriv="1302"/>
+        <param name="params" type="GLfloat *"/>
     </function>
 
-    <function name="GetVertexAttribivARB" offset="assign">
+    <function name="GetVertexAttribivARB" alias="GetVertexAttribiv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true" variable_param="pname"/>
-        <glx handcode="client" vendorpriv="1303"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="VertexAttrib1dARB" offset="assign"
-              vectorequiv="VertexAttrib1dvARB" exec="loopback">
+    <function name="VertexAttrib1dARB"
+              vectorequiv="VertexAttrib1dv" alias="VertexAttrib1d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib1dvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib1dvARB" alias="VertexAttrib1dv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *" count="1"/>
-        <glx rop="4197" doubles_in_order="true"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="VertexAttrib1fARB" offset="assign"
@@ -7071,29 +7151,27 @@
         <glx rop="4193"/>
     </function>
 
-    <function name="VertexAttrib1sARB" offset="assign"
-              vectorequiv="VertexAttrib1svARB" exec="loopback">
+    <function name="VertexAttrib1sARB"
+              vectorequiv="VertexAttrib1sv" alias="VertexAttrib1s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib1svARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib1svARB" alias="VertexAttrib1sv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *" count="1"/>
-        <glx rop="4189"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttrib2dARB" offset="assign"
-              vectorequiv="VertexAttrib2dvARB" exec="loopback">
+    <function name="VertexAttrib2dARB"
+              vectorequiv="VertexAttrib2dv" alias="VertexAttrib2d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib2dvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib2dvARB" alias="VertexAttrib2dv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *" count="2"/>
-        <glx rop="4198" doubles_in_order="true"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="VertexAttrib2fARB" offset="assign"
@@ -7109,31 +7187,29 @@
         <glx rop="4194"/>
     </function>
 
-    <function name="VertexAttrib2sARB" offset="assign"
-              vectorequiv="VertexAttrib2svARB" exec="loopback">
+    <function name="VertexAttrib2sARB"
+              vectorequiv="VertexAttrib2sv" alias="VertexAttrib2s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib2svARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib2svARB" alias="VertexAttrib2sv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *" count="2"/>
-        <glx rop="4190"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttrib3dARB" offset="assign"
-              vectorequiv="VertexAttrib3dvARB" exec="loopback">
+    <function name="VertexAttrib3dARB"
+              vectorequiv="VertexAttrib3dv" alias="VertexAttrib3d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib3dvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib3dvARB" alias="VertexAttrib3dv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *" count="3"/>
-        <glx rop="4199" doubles_in_order="true"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="VertexAttrib3fARB" offset="assign"
@@ -7150,22 +7226,21 @@
         <glx rop="4195"/>
     </function>
 
-    <function name="VertexAttrib3sARB" offset="assign"
-              vectorequiv="VertexAttrib3svARB" exec="loopback">
+    <function name="VertexAttrib3sARB"
+              vectorequiv="VertexAttrib3sv" alias="VertexAttrib3s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib3svARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib3svARB" alias="VertexAttrib3sv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *" count="3"/>
-        <glx rop="4191"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttrib4dARB" offset="assign"
-              vectorequiv="VertexAttrib4dvARB" exec="loopback">
+    <function name="VertexAttrib4dARB"
+              vectorequiv="VertexAttrib4dv" alias="VertexAttrib4d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -7173,10 +7248,9 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib4dvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4dvARB" alias="VertexAttrib4dv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLdouble *" count="4"/>
-        <glx rop="4200" doubles_in_order="true"/>
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="VertexAttrib4fARB" offset="assign"
@@ -7194,8 +7268,8 @@
         <glx rop="4196"/>
     </function>
 
-    <function name="VertexAttrib4sARB" offset="assign"
-              vectorequiv="VertexAttrib4svARB" exec="loopback">
+    <function name="VertexAttrib4sARB"
+              vectorequiv="VertexAttrib4sv" alias="VertexAttrib4s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
@@ -7203,14 +7277,13 @@
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib4svARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4svARB" alias="VertexAttrib4sv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *" count="4"/>
-        <glx rop="4192"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttrib4NubARB" offset="assign"
-              vectorequiv="VertexAttrib4NubvARB" exec="loopback">
+    <function name="VertexAttrib4NubARB"
+              vectorequiv="VertexAttrib4Nubv" alias="VertexAttrib4Nub">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
@@ -7218,90 +7291,76 @@
         <param name="w" type="GLubyte"/>
     </function>
 
-    <function name="VertexAttrib4NubvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NubvARB" alias="VertexAttrib4Nubv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLubyte *" count="4"/>
-        <glx rop="4201"/>
+        <param name="v" type="const GLubyte *"/>
     </function>
 
-    <function name="VertexAttrib4bvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4bvARB" alias="VertexAttrib4bv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLbyte *" count="4"/>
-        <glx rop="4230"/>
+        <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="VertexAttrib4ivARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4ivARB" alias="VertexAttrib4iv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLint *" count="4"/>
-        <glx rop="4231"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="VertexAttrib4ubvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4ubvARB" alias="VertexAttrib4ubv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLubyte *" count="4"/>
-        <glx rop="4232"/>
+        <param name="v" type="const GLubyte *"/>
     </function>
 
-    <function name="VertexAttrib4usvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4usvARB" alias="VertexAttrib4usv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLushort *" count="4"/>
-        <glx rop="4233"/>
+        <param name="v" type="const GLushort *"/>
     </function>
 
-    <function name="VertexAttrib4uivARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4uivARB" alias="VertexAttrib4uiv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLuint *" count="4"/>
-        <glx rop="4234"/>
+        <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="VertexAttrib4NbvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NbvARB" alias="VertexAttrib4Nbv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLbyte *" count="4"/>
-        <glx rop="4235"/>
+        <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="VertexAttrib4NsvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NsvARB" alias="VertexAttrib4Nsv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLshort *" count="4"/>
-        <glx rop="4236"/>
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="VertexAttrib4NivARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NivARB" alias="VertexAttrib4Niv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLint *" count="4"/>
-        <glx rop="4237"/>
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="VertexAttrib4NusvARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NusvARB" alias="VertexAttrib4Nusv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLushort *" count="4"/>
-        <glx rop="4238"/>
+        <param name="v" type="const GLushort *"/>
     </function>
 
-    <function name="VertexAttrib4NuivARB" offset="assign" exec="loopback">
+    <function name="VertexAttrib4NuivARB" alias="VertexAttrib4Nuiv">
         <param name="index" type="GLuint"/>
-        <param name="v" type="const GLuint *" count="4"/>
-        <glx rop="4239"/>
+        <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="VertexAttribPointerARB" offset="assign">
+    <function name="VertexAttribPointerARB" alias="VertexAttribPointer">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="EnableVertexAttribArrayARB" offset="assign">
+    <function name="EnableVertexAttribArrayARB" alias="EnableVertexAttribArray">
         <param name="index" type="GLuint"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="DisableVertexAttribArrayARB" offset="assign">
+    <function name="DisableVertexAttribArrayARB" alias="DisableVertexAttribArray">
         <param name="index" type="GLuint"/>
-        <glx handcode="true"/>
     </function>
 
     <function name="ProgramStringARB" offset="assign" deprecated="3.1">
@@ -7312,24 +7371,28 @@
         <glx rop="4217" large="true"/>
     </function>
 
-    <function name="BindProgramARB" alias="BindProgramNV">
+    <function name="BindProgramARB" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="program" type="GLuint"/>
+        <glx rop="4180"/>
     </function>
 
-    <function name="DeleteProgramsARB" alias="DeleteProgramsNV">
-        <param name="n" type="GLsizei"/>
-        <param name="programs" type="const GLuint *"/>
+    <function name="DeleteProgramsARB" offset="assign">
+        <param name="n" type="GLsizei" counter="true"/>
+        <param name="programs" type="const GLuint *" count="n"/>
+        <glx vendorpriv="1294"/>
     </function>
 
-    <function name="GenProgramsARB" alias="GenProgramsNV">
+    <function name="GenProgramsARB" offset="assign">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="programs" type="GLuint *" output="true" count="n"/>
+        <glx vendorpriv="1295" always_array="true"/>
     </function>
 
-    <function name="IsProgramARB" alias="IsProgramNV">
+    <function name="IsProgramARB" offset="assign">
         <param name="program" type="GLuint"/>
         <return type="GLboolean"/>
+        <glx vendorpriv="1304"/>
     </function>
 
     <function name="ProgramEnvParameter4dARB" offset="assign"
@@ -7463,7 +7526,7 @@
         <glx vendorpriv="1308" handcode="server" always_array="true"/>
     </function>
 
-    <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointervNV">
+    <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointerv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="pointer" type="GLvoid **" output="true"/>
@@ -7520,10 +7583,10 @@
 
 <category name="GL_ARB_vertex_buffer_object" number="28">
     <enum name="BUFFER_SIZE_ARB"               count="1"  value="0x8764">
-        <size name="GetBufferParameterivARB" mode="get"/>
+        <size name="GetBufferParameteriv" mode="get"/>
     </enum>
     <enum name="BUFFER_USAGE_ARB"              count="1"  value="0x8765">
-        <size name="GetBufferParameterivARB" mode="get"/>
+        <size name="GetBufferParameteriv" mode="get"/>
     </enum>
     <enum name="ARRAY_BUFFER_BINDING_ARB"      count="1"  value="0x8894">
         <size name="Get" mode="get"/>
@@ -7559,18 +7622,18 @@
         <size name="Get" mode="get"/>
     </enum>
     <enum name="VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB" count="1" value="0x889F">
-        <size name="GetVertexAttribdvARB" mode="get"/>
-        <size name="GetVertexAttribfvARB" mode="get"/>
-        <size name="GetVertexAttribivARB" mode="get"/>
+        <size name="GetVertexAttribdv" mode="get"/>
+        <size name="GetVertexAttribfv" mode="get"/>
+        <size name="GetVertexAttribiv" mode="get"/>
     </enum>
     <enum name="READ_ONLY_ARB"                            value="0x88B8"/>
     <enum name="WRITE_ONLY_ARB"                           value="0x88B9"/>
     <enum name="READ_WRITE_ARB"                           value="0x88BA"/>
     <enum name="BUFFER_ACCESS_ARB"             count="1"  value="0x88BB">
-        <size name="GetBufferParameterivARB" mode="get"/>
+        <size name="GetBufferParameteriv" mode="get"/>
     </enum>
     <enum name="BUFFER_MAPPED_ARB"             count="1"  value="0x88BC">
-        <size name="GetBufferParameterivARB" mode="get"/>
+        <size name="GetBufferParameteriv" mode="get"/>
     </enum>
     <enum name="BUFFER_MAP_POINTER_ARB"                   value="0x88BD"/>
     <enum name="STREAM_DRAW_ARB"                          value="0x88E0"/>
@@ -7586,147 +7649,128 @@
     <type name="intptrARB"   size="4"                  glx_name="CARD32"/>
     <type name="sizeiptrARB" size="4"  unsigned="true" glx_name="CARD32"/>
 
-    <function name="BindBufferARB" offset="assign">
+    <function name="BindBufferARB" alias="BindBuffer">
         <param name="target" type="GLenum"/>
         <param name="buffer" type="GLuint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="BufferDataARB" offset="assign">
+    <function name="BufferDataARB" alias="BufferData">
         <param name="target" type="GLenum"/>
-        <param name="size" type="GLsizeiptrARB" counter="true"/>
-        <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/>
+        <param name="size" type="GLsizeiptrARB"/>
+        <param name="data" type="const GLvoid *"/>
         <param name="usage" type="GLenum"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="BufferSubDataARB" offset="assign">
+    <function name="BufferSubDataARB" alias="BufferSubData">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptrARB"/>
-        <param name="size" type="GLsizeiptrARB" counter="true"/>
-        <param name="data" type="const GLvoid *" count="size"/>
-        <glx ignore="true"/>
+        <param name="size" type="GLsizeiptrARB"/>
+        <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="DeleteBuffersARB" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="buffer" type="const GLuint *" count="n"/>
-        <glx ignore="true"/>
+    <function name="DeleteBuffersARB" alias="DeleteBuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="buffer" type="const GLuint *"/>
     </function>
 
-    <function name="GenBuffersARB" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="buffer" type="GLuint *" output="true" count="n"/>
-        <glx ignore="true"/>
+    <function name="GenBuffersARB" alias="GenBuffers">
+        <param name="n" type="GLsizei"/>
+        <param name="buffer" type="GLuint *"/>
     </function>
 
-    <function name="GetBufferParameterivARB" offset="assign">
+    <function name="GetBufferParameterivARB" alias="GetBufferParameteriv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true" variable_param="pname"/>
-        <glx ignore="true"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetBufferPointervARB" offset="assign">
+    <function name="GetBufferPointervARB" alias="GetBufferPointerv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLvoid **" output="true"/>
-        <glx ignore="true"/>
+        <param name="params" type="GLvoid **"/>
     </function>
 
-    <function name="GetBufferSubDataARB" offset="assign">
+    <function name="GetBufferSubDataARB" alias="GetBufferSubData">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptrARB"/>
-        <param name="size" type="GLsizeiptrARB" counter="true"/>
-        <param name="data" type="GLvoid *" output="true" count="size"/>
-        <glx ignore="true"/>
+        <param name="size" type="GLsizeiptrARB"/>
+        <param name="data" type="GLvoid *"/>
     </function>
 
-    <function name="IsBufferARB" offset="assign">
+    <function name="IsBufferARB" alias="IsBuffer">
         <param name="buffer" type="GLuint"/>
         <return type="GLboolean"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="MapBufferARB" offset="assign">
+    <function name="MapBufferARB" alias="MapBuffer">
         <param name="target" type="GLenum"/>
         <param name="access" type="GLenum"/>
         <return type="GLvoid *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="UnmapBufferARB" offset="assign">
+    <function name="UnmapBufferARB" alias="UnmapBuffer">
         <param name="target" type="GLenum"/>
         <return type="GLboolean"/>
-        <glx ignore="true"/>
     </function>
 </category>
 
 <category name="GL_ARB_occlusion_query" number="29">
     <enum name="QUERY_COUNTER_BITS_ARB"        count="1"  value="0x8864">
-        <size name="GetQueryivARB" mode="get"/>
+        <size name="GetQueryiv" mode="get"/>
     </enum>
     <enum name="CURRENT_QUERY_ARB"             count="1"  value="0x8865">
-        <size name="GetQueryivARB" mode="get"/>
+        <size name="GetQueryiv" mode="get"/>
     </enum>
     <enum name="QUERY_RESULT_ARB"              count="1"  value="0x8866">
-        <size name="GetQueryObjectivARB" mode="get"/>
-        <size name="GetQueryObjectuivARB" mode="get"/>
+        <size name="GetQueryObjectiv" mode="get"/>
+        <size name="GetQueryObjectuiv" mode="get"/>
     </enum>
     <enum name="QUERY_RESULT_AVAILABLE_ARB"    count="1"  value="0x8867">
-        <size name="GetQueryObjectivARB" mode="get"/>
-        <size name="GetQueryObjectuivARB" mode="get"/>
+        <size name="GetQueryObjectiv" mode="get"/>
+        <size name="GetQueryObjectuiv" mode="get"/>
     </enum>
     <enum name="SAMPLES_PASSED_ARB"                       value="0x8914"/>
 
-    <function name="GenQueriesARB" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="ids" type="GLuint *" output="true" count="n"/>
-        <glx sop="162" always_array="true"/>
+    <function name="GenQueriesARB" alias="GenQueries">
+        <param name="n" type="GLsizei"/>
+        <param name="ids" type="GLuint *"/>
     </function>
 
-    <function name="DeleteQueriesARB" offset="assign">
-        <param name="n" type="GLsizei" counter="true"/>
-        <param name="ids" type="const GLuint *" count="n"/>
-        <glx sop="161"/>
+    <function name="DeleteQueriesARB" alias="DeleteQueries">
+        <param name="n" type="GLsizei"/>
+        <param name="ids" type="const GLuint *"/>
     </function>
 
-    <function name="IsQueryARB" offset="assign">
+    <function name="IsQueryARB" alias="IsQuery">
         <param name="id" type="GLuint"/>
         <return type="GLboolean"/>
-        <glx sop="163"/>
     </function>
 
-    <function name="BeginQueryARB" offset="assign">
+    <function name="BeginQueryARB" alias="BeginQuery">
         <param name="target" type="GLenum"/>
         <param name="id" type="GLuint"/>
-        <glx rop="231"/>
     </function>
 
-    <function name="EndQueryARB" offset="assign">
+    <function name="EndQueryARB" alias="EndQuery">
         <param name="target" type="GLenum"/>
-        <glx rop="232"/>
     </function>
 
-    <function name="GetQueryivARB" offset="assign">
+    <function name="GetQueryivARB" alias="GetQueryiv">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true" variable_param="pname"/>
-        <glx sop="164"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetQueryObjectivARB" offset="assign">
+    <function name="GetQueryObjectivARB" alias="GetQueryObjectiv">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *" output="true" variable_param="pname"/>
-        <glx sop="165"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetQueryObjectuivARB" offset="assign">
+    <function name="GetQueryObjectuivARB" alias="GetQueryObjectuiv">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLuint *" output="true" variable_param="pname"/>
-        <glx sop="166"/>
+        <param name="params" type="GLuint *"/>
     </function>
 </category>
 
@@ -7784,17 +7828,15 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="ShaderSourceARB" offset="assign">
+    <function name="ShaderSourceARB" alias="ShaderSource">
         <param name="shader" type="GLhandleARB"/>
         <param name="count" type="GLsizei"/>
         <param name="string" type="const GLcharARB **"/>
         <param name="length" type="const GLint *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="CompileShaderARB" offset="assign">
+    <function name="CompileShaderARB" alias="CompileShader">
         <param name="shader" type="GLhandleARB"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="CreateProgramObjectARB" offset="assign">
@@ -7808,159 +7850,137 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="LinkProgramARB" offset="assign">
+    <function name="LinkProgramARB" alias="LinkProgram">
         <param name="program" type="GLhandleARB"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="UseProgramObjectARB" offset="assign">
+    <function name="UseProgramObjectARB" alias="UseProgram">
         <param name="program" type="GLhandleARB"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="ValidateProgramARB" offset="assign">
+    <function name="ValidateProgramARB" alias="ValidateProgram">
         <param name="program" type="GLhandleARB"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1fARB" offset="assign">
+    <function name="Uniform1fARB" alias="Uniform1f">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform2fARB" offset="assign">
+    <function name="Uniform2fARB" alias="Uniform2f">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform3fARB" offset="assign">
+    <function name="Uniform3fARB" alias="Uniform3f">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <param name="v2" type="GLfloat"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform4fARB" offset="assign">
+    <function name="Uniform4fARB" alias="Uniform4f">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <param name="v2" type="GLfloat"/>
         <param name="v3" type="GLfloat"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1iARB" offset="assign">
+    <function name="Uniform1iARB" alias="Uniform1i">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform2iARB" offset="assign">
+    <function name="Uniform2iARB" alias="Uniform2i">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform3iARB" offset="assign">
+    <function name="Uniform3iARB" alias="Uniform3i">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <param name="v2" type="GLint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform4iARB" offset="assign">
+    <function name="Uniform4iARB" alias="Uniform4i">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <param name="v2" type="GLint"/>
         <param name="v3" type="GLint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1fvARB" offset="assign">
+    <function name="Uniform1fvARB" alias="Uniform1fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform2fvARB" offset="assign">
+    <function name="Uniform2fvARB" alias="Uniform2fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform3fvARB" offset="assign">
+    <function name="Uniform3fvARB" alias="Uniform3fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform4fvARB" offset="assign">
+    <function name="Uniform4fvARB" alias="Uniform4fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1ivARB" offset="assign">
+    <function name="Uniform1ivARB" alias="Uniform1iv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform2ivARB" offset="assign">
+    <function name="Uniform2ivARB" alias="Uniform2iv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform3ivARB" offset="assign">
+    <function name="Uniform3ivARB" alias="Uniform3iv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="Uniform4ivARB" offset="assign">
+    <function name="Uniform4ivARB" alias="Uniform4iv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix2fvARB" offset="assign">
+    <function name="UniformMatrix2fvARB" alias="UniformMatrix2fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix3fvARB" offset="assign">
+    <function name="UniformMatrix3fvARB" alias="UniformMatrix3fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix4fvARB" offset="assign">
+    <function name="UniformMatrix4fvARB" alias="UniformMatrix4fv">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
-        <glx ignore="true"/>
     </function>
 
     <function name="GetObjectParameterfvARB" offset="assign">
@@ -7993,44 +8013,39 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformLocationARB" offset="assign">
+    <function name="GetUniformLocationARB" alias="GetUniformLocation">
         <param name="program" type="GLhandleARB"/>
         <param name="name" type="const GLcharARB *"/>
         <return type="GLint"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="GetActiveUniformARB" offset="assign">
+    <function name="GetActiveUniformARB" alias="GetActiveUniform">
         <param name="program" type="GLhandleARB"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
-        <param name="length" type="GLsizei *" output="true"/>
-        <param name="size" type="GLint *" output="true"/>
-        <param name="type" type="GLenum *" output="true"/>
-        <param name="name" type="GLcharARB *" output="true"/>
-        <glx ignore="true"/>
+        <param name="length" type="GLsizei *"/>
+        <param name="size" type="GLint *"/>
+        <param name="type" type="GLenum *"/>
+        <param name="name" type="GLcharARB *"/>
     </function>
 
-    <function name="GetUniformfvARB" offset="assign">
+    <function name="GetUniformfvARB" alias="GetUniformfv">
         <param name="program" type="GLhandleARB"/>
         <param name="location" type="GLint"/>
-        <param name="params" type="GLfloat *" output="true"/>
-        <glx ignore="true"/>
+        <param name="params" type="GLfloat *"/>
     </function>
 
-    <function name="GetUniformivARB" offset="assign">
+    <function name="GetUniformivARB" alias="GetUniformiv">
         <param name="program" type="GLhandleARB"/>
         <param name="location" type="GLint"/>
-        <param name="params" type="GLint *" output="true"/>
-        <glx ignore="true"/>
+        <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetShaderSourceARB" offset="assign">
+    <function name="GetShaderSourceARB" alias="GetShaderSource">
         <param name="shader" type="GLhandleARB"/>
         <param name="bufSize" type="GLsizei"/>
-        <param name="length" type="GLsizei *" output="true"/>
-        <param name="source" type="GLcharARB *" output="true"/>
-        <glx ignore="true"/>
+        <param name="length" type="GLsizei *"/>
+        <param name="source" type="GLcharARB *"/>
     </function>
 </category>
 
@@ -8043,29 +8058,26 @@
     <enum name="OBJECT_ACTIVE_ATTRIBUTES_ARB"             value="0x8B89"/>
     <enum name="OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB"   value="0x8B8A"/>
 
-    <function name="BindAttribLocationARB" offset="assign">
+    <function name="BindAttribLocationARB" alias="BindAttribLocation">
         <param name="program" type="GLhandleARB"/>
         <param name="index" type="GLuint"/>
         <param name="name" type="const GLcharARB *"/>
-        <glx ignore="true"/>
     </function>
 
-    <function name="GetActiveAttribARB" offset="assign">
+    <function name="GetActiveAttribARB" alias="GetActiveAttrib">
         <param name="program" type="GLhandleARB"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
-        <param name="length" type="GLsizei *" output="true"/>
-        <param name="size" type="GLint *" output="true"/>
-        <param name="type" type="GLenum *" output="true"/>
-        <param name="name" type="GLcharARB *" output="true"/>
-        <glx ignore="true"/>
+        <param name="length" type="GLsizei *"/>
+        <param name="size" type="GLint *"/>
+        <param name="type" type="GLenum *"/>
+        <param name="name" type="GLcharARB *"/>
     </function>
 
-    <function name="GetAttribLocationARB" offset="assign">
+    <function name="GetAttribLocationARB" alias="GetAttribLocation">
         <param name="program" type="GLhandleARB"/>
         <param name="name" type="const GLcharARB *"/>
         <return type="GLint"/>
-        <glx ignore="true"/>
     </function>
 </category>
 
@@ -8207,12 +8219,12 @@
     <enum name="TIMESTAMP" value="0x8E28"/>
     <type name="int64"                  size="8"/>
     <type name="uint64" unsigned="true" size="8"/>
-    <function name="GetQueryObjecti64v" alias="GetQueryObjecti64vEXT" static_dispatch="false">
+    <function name="GetQueryObjecti64v" static_dispatch="false" offset="assign">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint64 *"/>
     </function>
-    <function name="GetQueryObjectui64v" alias="GetQueryObjectui64vEXT" static_dispatch="false">
+    <function name="GetQueryObjectui64v" static_dispatch="false" offset="assign">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint64 *"/>
@@ -9302,28 +9314,26 @@
 
 <category name="GL_EXT_point_parameters" number="54">
     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
 
-    <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT">
+    <function name="PointParameterfEXT" alias="PointParameterf">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
-        <glx rop="2065"/>
     </function>
 
-    <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT">
+    <function name="PointParameterfvEXT" alias="PointParameterfv">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLfloat *" variable_param="pname"/>
-        <glx rop="2066"/>
+        <param name="params" type="const GLfloat *"/>
     </function>
 </category>
 
@@ -10028,32 +10038,26 @@
 </category>
 
 <category name="GL_EXT_secondary_color" number="145">
-    <function name="SecondaryColor3bEXT" offset="assign"
-              vectorequiv="SecondaryColor3bvEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3bEXT"
+              vectorequiv="SecondaryColor3bv" alias="SecondaryColor3b">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLbyte *" count="3"/>
-        <glx rop="4126"/>
+    <function name="SecondaryColor3bvEXT" alias="SecondaryColor3bv">
+        <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="SecondaryColor3dEXT" offset="assign"
-              vectorequiv="SecondaryColor3dvEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3dEXT"
+              vectorequiv="SecondaryColor3dv" alias="SecondaryColor3d">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLdouble *" count="3"/>
-        <glx rop="4130"/>
+    <function name="SecondaryColor3dvEXT" alias="SecondaryColor3dv">
+        <param name="v" type="const GLdouble *"/>
     </function>
 
     <function name="SecondaryColor3fEXT" offset="assign" vectorequiv="SecondaryColor3fvEXT">
@@ -10067,82 +10071,66 @@
         <glx rop="4129"/>
     </function>
 
-    <function name="SecondaryColor3iEXT" offset="assign"
-              vectorequiv="SecondaryColor3ivEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3iEXT"
+              vectorequiv="SecondaryColor3iv" alias="SecondaryColor3i">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLint *" count="3"/>
-        <glx rop="4128"/>
+    <function name="SecondaryColor3ivEXT" alias="SecondaryColor3iv">
+        <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="SecondaryColor3sEXT" offset="assign"
-              vectorequiv="SecondaryColor3svEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3sEXT"
+              vectorequiv="SecondaryColor3sv" alias="SecondaryColor3s">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="SecondaryColor3svEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLshort *" count="3"/>
-        <glx rop="4127"/>
+    <function name="SecondaryColor3svEXT" alias="SecondaryColor3sv">
+        <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="SecondaryColor3ubEXT" offset="assign"
-              vectorequiv="SecondaryColor3ubvEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3ubEXT"
+              vectorequiv="SecondaryColor3ubv" alias="SecondaryColor3ub">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLubyte *" count="3"/>
-        <glx rop="4131"/>
+    <function name="SecondaryColor3ubvEXT" alias="SecondaryColor3ubv">
+        <param name="v" type="const GLubyte *"/>
     </function>
 
-    <function name="SecondaryColor3uiEXT" offset="assign"
-              vectorequiv="SecondaryColor3uivEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3uiEXT"
+              vectorequiv="SecondaryColor3uiv" alias="SecondaryColor3ui">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLuint *" count="3"/>
-        <glx rop="4133"/>
+    <function name="SecondaryColor3uivEXT" alias="SecondaryColor3uiv">
+        <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="SecondaryColor3usEXT" offset="assign"
-              vectorequiv="SecondaryColor3usvEXT" exec="loopback"
-              mesa_name="+_f">
+    <function name="SecondaryColor3usEXT"
+              vectorequiv="SecondaryColor3usv" alias="SecondaryColor3us">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback"
-              mesa_name="+_f">
-        <param name="v" type="const GLushort *" count="3"/>
-        <glx rop="4132"/>
+    <function name="SecondaryColor3usvEXT" alias="SecondaryColor3usv">
+        <param name="v" type="const GLushort *"/>
     </function>
 
-    <function name="SecondaryColorPointerEXT" offset="assign">
+    <function name="SecondaryColorPointerEXT" alias="SecondaryColorPointer">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
-        <glx handcode="true"/>
     </function>
 </category>
 
@@ -10153,12 +10141,11 @@
 </category>
 
 <category name="GL_EXT_multi_draw_arrays" number="148">
-    <function name="MultiDrawArraysEXT" offset="assign" es1="1.0" es2="2.0">
+    <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays">
         <param name="mode" type="GLenum"/>
         <param name="first" type="const GLint *"/>
         <param name="count" type="const GLsizei *"/>
         <param name="primcount" type="GLsizei"/>
-        <glx handcode="true"/>
     </function>
 
     <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0"
@@ -10183,21 +10170,18 @@
         <glx rop="4124"/>
     </function>
 
-    <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT"
-              exec="loopback">
+    <function name="FogCoorddEXT" vectorequiv="FogCoorddv" alias="FogCoordd">
         <param name="coord" type="GLdouble"/>
     </function>
 
-    <function name="FogCoorddvEXT" offset="assign" exec="loopback">
-        <param name="coord" type="const GLdouble *" count="1"/>
-        <glx rop="4125"/>
+    <function name="FogCoorddvEXT" alias="FogCoorddv">
+        <param name="coord" type="const GLdouble *"/>
     </function>
 
-    <function name="FogCoordPointerEXT" offset="assign">
+    <function name="FogCoordPointerEXT" alias="FogCoordPointer">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
-        <glx handcode="true"/>
     </function>
 </category>
 
@@ -10788,12 +10772,11 @@
 <!-- Extension number 172 is a WGL extension. -->
 
 <category name="GL_EXT_blend_func_separate" number="173">
-    <function name="BlendFuncSeparateEXT" offset="assign">
+    <function name="BlendFuncSeparateEXT" alias="BlendFuncSeparate">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
         <param name="sfactorAlpha" type="GLenum"/>
         <param name="dfactorAlpha" type="GLenum"/>
-        <glx rop="4134"/>
     </function>
 </category>
 
@@ -11040,95 +11023,80 @@
 </category>
 
 <category name="GL_MESA_window_pos" number="197">
-    <function name="WindowPos2dMESA" offset="assign">
+    <function name="WindowPos2dMESA" alias="WindowPos2d">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2dvMESA" offset="assign">
+    <function name="WindowPos2dvMESA" alias="WindowPos2dv">
         <param name="v" type="const GLdouble *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2fMESA" offset="assign">
+    <function name="WindowPos2fMESA" alias="WindowPos2f">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2fvMESA" offset="assign">
+    <function name="WindowPos2fvMESA" alias="WindowPos2fv">
         <param name="v" type="const GLfloat *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2iMESA" offset="assign">
+    <function name="WindowPos2iMESA" alias="WindowPos2i">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2ivMESA" offset="assign">
+    <function name="WindowPos2ivMESA" alias="WindowPos2iv">
         <param name="v" type="const GLint *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2sMESA" offset="assign">
+    <function name="WindowPos2sMESA" alias="WindowPos2s">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2svMESA" offset="assign">
+    <function name="WindowPos2svMESA" alias="WindowPos2sv">
         <param name="v" type="const GLshort *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3dMESA" offset="assign">
+    <function name="WindowPos3dMESA" alias="WindowPos3d">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3dvMESA" offset="assign">
+    <function name="WindowPos3dvMESA" alias="WindowPos3dv">
         <param name="v" type="const GLdouble *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3fMESA" offset="assign" vectorequiv="WindowPos3fvMESA">
+    <function name="WindowPos3fMESA" vectorequiv="WindowPos3fv" alias="WindowPos3f">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="WindowPos3fvMESA" offset="assign">
-        <param name="v" type="const GLfloat *" count="3"/>
-        <glx rop="230"/>
+    <function name="WindowPos3fvMESA" alias="WindowPos3fv">
+        <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="WindowPos3iMESA" offset="assign">
+    <function name="WindowPos3iMESA" alias="WindowPos3i">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3ivMESA" offset="assign">
+    <function name="WindowPos3ivMESA" alias="WindowPos3iv">
         <param name="v" type="const GLint *"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3sMESA" offset="assign">
+    <function name="WindowPos3sMESA" alias="WindowPos3s">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
-        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3svMESA" offset="assign">
+    <function name="WindowPos3svMESA" alias="WindowPos3sv">
         <param name="v" type="const GLshort *"/>
-        <glx handcode="true"/>
     </function>
 
     <function name="WindowPos4dMESA" offset="assign" deprecated="3.1">
@@ -11609,18 +11577,14 @@
         <glx vendorpriv="1293"/>
     </function>
 
-    <function name="BindProgramNV" offset="assign" deprecated="3.1"
-              mesa_name="-NV">
+    <function name="BindProgramNV" deprecated="3.1" alias="BindProgramARB">
         <param name="target" type="GLenum"/>
         <param name="program" type="GLuint"/>
-        <glx rop="4180"/>
     </function>
 
-    <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"/>
+    <function name="DeleteProgramsNV" deprecated="3.1" alias="DeleteProgramsARB">
+        <param name="n" type="GLsizei"/>
+        <param name="programs" type="const GLuint *"/>
     </function>
 
     <function name="ExecuteProgramNV" offset="assign" deprecated="3.1"
@@ -11631,11 +11595,9 @@
         <glx rop="4181"/>
     </function>
 
-    <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"/>
+    <function name="GenProgramsNV" deprecated="3.1" alias="GenProgramsARB">
+        <param name="n" type="GLsizei"/>
+        <param name="programs" type="GLuint *"/>
      </function>
 
     <!-- This isn't 100% correct.  Currently, the only valid value of pname
@@ -11711,19 +11673,15 @@
         <glx vendorpriv="1303"/>
     </function>
 
-    <function name="GetVertexAttribPointervNV" offset="assign"
-              mesa_name="-NV+ARB">
+    <function name="GetVertexAttribPointervNV" alias="GetVertexAttribPointerv">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="pointer" type="GLvoid **" output="true"/>
-        <glx handcode="true"/>
+        <param name="pointer" type="GLvoid **"/>
     </function>
 
-    <function name="IsProgramNV" offset="assign" deprecated="3.1"
-              mesa_name="-NV+ARB">
+    <function name="IsProgramNV" deprecated="3.1" alias="IsProgramARB">
         <param name="program" type="GLuint"/>
         <return type="GLboolean"/>
-        <glx vendorpriv="1304"/>
     </function>
 
     <function name="LoadProgramNV" offset="assign" deprecated="3.1"
@@ -11810,49 +11768,46 @@
     </function>
 
     <function name="VertexAttrib1sNV" offset="assign"
-              vectorequiv="VertexAttrib1svNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib1svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="4265"/>
     </function>
 
     <function name="VertexAttrib2sNV" offset="assign"
-              vectorequiv="VertexAttrib2svNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib2svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="4266"/>
     </function>
 
     <function name="VertexAttrib3sNV" offset="assign"
-              vectorequiv="VertexAttrib3svNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib3svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="4267"/>
     </function>
 
     <function name="VertexAttrib4sNV" offset="assign"
-              vectorequiv="VertexAttrib4svNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib4svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
@@ -11860,8 +11815,7 @@
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="4268"/>
@@ -11930,49 +11884,46 @@
     </function>
 
     <function name="VertexAttrib1dNV" offset="assign"
-              vectorequiv="VertexAttrib1dvNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib1dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="4273" doubles_in_order="true"/>
     </function>
 
     <function name="VertexAttrib2dNV" offset="assign"
-              vectorequiv="VertexAttrib2dvNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib2dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="4274" doubles_in_order="true"/>
     </function>
 
     <function name="VertexAttrib3dNV" offset="assign"
-              vectorequiv="VertexAttrib3dvNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib3dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="4275" doubles_in_order="true"/>
     </function>
 
     <function name="VertexAttrib4dNV" offset="assign"
-              vectorequiv="VertexAttrib4dvNV" deprecated="3.1" exec="loopback">
+              vectorequiv="VertexAttrib4dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -11980,16 +11931,14 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="4276" doubles_in_order="true"/>
     </function>
 
     <function name="VertexAttrib4ubNV" offset="assign"
-              vectorequiv="VertexAttrib4ubvNV" deprecated="3.1"
-              exec="loopback">
+              vectorequiv="VertexAttrib4ubvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
@@ -11997,111 +11946,97 @@
         <param name="w" type="GLubyte"/>
     </function>
 
-    <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="4277"/>
     </function>
 
-    <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n"/>
         <glx rop="4202"/>
     </function>
 
-    <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="2"/>
         <glx rop="4203"/>
     </function>
 
-    <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="3"/>
         <glx rop="4204"/>
     </function>
 
-    <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="4"/>
         <glx rop="4205"/>
     </function>
 
-    <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n"/>
         <glx rop="4206"/>
     </function>
 
-    <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="2"/>
         <glx rop="4207"/>
     </function>
 
-    <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="3"/>
         <glx rop="4208"/>
     </function>
 
-    <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="4"/>
         <glx rop="4209"/>
     </function>
 
-    <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n"/>
         <glx rop="4210" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="2"/>
         <glx rop="4211" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="3"/>
         <glx rop="4212" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="4"/>
         <glx rop="4213" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1"
-              exec="loopback">
+    <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLubyte *" count="n" count_scale="4"/>
@@ -12471,16 +12406,16 @@
          added for this extension. -->
 
     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">
-        <size name="PointParameterivNV"/>
+        <size name="PointParameteriv"/>
     </enum>
     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">
-        <size name="PointParameterivNV"/>
+        <size name="PointParameteriv"/>
     </enum>
     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">
-        <size name="PointParameterivNV"/>
+        <size name="PointParameteriv"/>
     </enum>
     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">
-        <size name="PointParameterivNV"/>
+        <size name="PointParameteriv"/>
     </enum>
 
     <enum name="POINT_SPRITE_NV"               count="1"  value="0x8861">
@@ -12493,21 +12428,19 @@
         <size name="GetTexEnviv" mode="get"/>
     </enum>
     <enum name="POINT_SPRITE_R_MODE_NV"        count="1"  value="0x8863">
-        <size name="PointParameterfvEXT"/>
-        <size name="PointParameterivNV"/>
+        <size name="PointParameterfv"/>
+        <size name="PointParameteriv"/>
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="PointParameteriNV" offset="assign" mesa_name="-NV">
+    <function name="PointParameteriNV" alias="PointParameteri">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
-        <glx rop="4221"/>
     </function>
 
-    <function name="PointParameterivNV" offset="assign" mesa_name="-NV">
+    <function name="PointParameterivNV" alias="PointParameteriv">
         <param name="pname" type="GLenum"/>
-        <param name="params" type="const GLint *" variable_param="pname"/>
-        <glx rop="4222"/>
+        <param name="params" type="const GLint *"/>
     </function>
 </category>
 
@@ -12684,10 +12617,9 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="BlendEquationSeparateEXT" offset="assign" static_dispatch="false">
+    <function name="BlendEquationSeparateEXT" static_dispatch="false" alias="BlendEquationSeparate">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
-        <glx rop="4228"/>
     </function>
 </category>
 
@@ -12846,7 +12778,7 @@
 <!-- Unnumbered extensions sorted by name. -->
 
 <category name="GL_ATI_blend_equation_separate">
-    <function name="BlendEquationSeparateATI" alias="BlendEquationSeparateEXT" static_dispatch="false">
+    <function name="BlendEquationSeparateATI" alias="BlendEquationSeparate" static_dispatch="false">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
     </function>
@@ -12904,12 +12836,12 @@
     <enum name="TIME_ELAPSED_EXT" value="0x88BF"/>
     <type name="int64EXT"                  size="8"/>
     <type name="uint64EXT" unsigned="true" size="8"/>
-    <function name="GetQueryObjecti64vEXT" offset="assign" static_dispatch="false">
+    <function name="GetQueryObjecti64vEXT" static_dispatch="false" alias="GetQueryObjecti64v">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint64EXT *"/>
     </function>
-    <function name="GetQueryObjectui64vEXT" offset="assign" static_dispatch="false">
+    <function name="GetQueryObjectui64vEXT" static_dispatch="false" alias="GetQueryObjectui64v">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint64EXT *"/>
@@ -12917,7 +12849,7 @@
 </category>
 
 <category name="GL_INGR_blend_func_separate">
-    <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparateEXT" static_dispatch="false">
+    <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparate" static_dispatch="false">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
         <param name="sfactorAlpha" type="GLenum"/>
@@ -12965,24 +12897,24 @@
 
 <category name="GL_SGIS_point_parameters">
     <enum name="POINT_SIZE_MIN_SGIS"           count="1"  value="0x8126">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_SIZE_MAX_SGIS"           count="1"  value="0x8127">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_FADE_THRESHOLD_SIZE_SGIS" count="1" value="0x8128">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
     <enum name="POINT_DISTANCE_ATTENUATION_SGIS" count="3" value="0x8129">
-        <size name="PointParameterfvEXT"/>
+        <size name="PointParameterfv"/>
     </enum>
 
-    <function name="PointParameterfSGIS" alias="PointParameterfEXT" static_dispatch="false">
+    <function name="PointParameterfSGIS" alias="PointParameterf" static_dispatch="false">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="PointParameterfvSGIS" alias="PointParameterfvEXT" static_dispatch="false">
+    <function name="PointParameterfvSGIS" alias="PointParameterfv" static_dispatch="false">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 47f8dd5b9..227e9fcd9 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -594,47 +594,6 @@ class gl_parameter(object):
             return self.type_expr.format_string()
 
 
-# Regular expression used to parse "mesa_name" attributes.  A
-# mesa_name attribute describes how to adjust a GL function name
-# suffix to obtain the name of the function in Mesa that implements
-# the functionality.  The attribute string consists of a part preceded
-# by a "-", indicating the suffix to remove, and a part preceded by a
-# "+" indicating the suffix to add.  Either part is optional.
-#
-# 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.
-#
-# Note: the prefix "_mesa_" is handled separately, by the "exec"
-# attribute.
-name_modification_regexp = re.compile(
-    r'^(-(?P<minus>[a-zA-Z0-9_]+))?(\+(?P<plus>[a-zA-Z0-9_]+))?$')
-
-
-# Interpret a "mesa_name" attribute (see above) to determine the
-# appropriate suffix for the Mesa function implementing a piece of GL
-# functionality, and return the properly suffixed name.
-def interpret_name_modification(name, mod):
-    m = name_modification_regexp.match(mod)
-    if m is None:
-        raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod))
-    new_name = name
-    if m.group('minus'):
-        if not new_name.endswith(m.group('minus')):
-            raise Exception(
-                'Cannot subtract suffix {0!r} from function {1}'.format(
-                    m.group('minus'), name))
-        new_name = new_name[:-len(m.group('minus'))]
-    if m.group('plus'):
-        new_name += m.group('plus')
-    return new_name
-
-
 class gl_function( gl_item ):
     def __init__(self, element, context):
         self.context = context
@@ -649,7 +608,6 @@ class gl_function( gl_item ):
         self.exec_flavor = 'mesa'
         self.desktop = True
         self.deprecated = None
-        self.mesa_name = None
 
         # self.entry_point_api_map[name][api] is a decimal value
         # indicating the earliest version of the given API in which
@@ -725,8 +683,8 @@ class gl_function( gl_item ):
         else:
             true_name = name
 
-            # Only try to set the offset and mesa_name when a
-            # non-alias entry-point is being processed.
+            # Only try to set the offset when a non-alias entry-point
+            # is being processed.
 
             offset = element.nsProp( "offset", None )
             if offset:
@@ -738,12 +696,6 @@ class gl_function( gl_item ):
                     if offset == "assign":
                         self.assign_offset = 1
 
-            mesa_name = element.nsProp('mesa_name', None)
-            if mesa_name is None:
-                self.mesa_name = name
-            else:
-                self.mesa_name = interpret_name_modification(name, mesa_name)
-
 
         if not self.name:
             self.name = true_name
diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
index 205f74fa9..18b0eb4ec 100644
--- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
@@ -18,53 +18,53 @@
     <type name="fixed"   size="4"                                    />
     <type name="clampx"  size="4"                                    />
 
-    <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="AlphaFuncx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="ClearColorx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
         <param name="alpha" type="GLclampx"/>
     </function>
 
-    <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="ClearDepthx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4x" alias="Color4xOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Color4x" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
         <param name="alpha" type="GLfixed"/>
     </function>
 
-    <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="DepthRangex" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0"
-              desktop="false">
+    <function name="Fogx" static_dispatch="false" es1="1.0"
+              desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0"
-              desktop="false">
+    <function name="Fogxv" static_dispatch="false" es1="1.0"
+              desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Frustumx" alias="FrustumxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Frustumx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -73,63 +73,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelx" alias="LightModelxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="LightModelx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxv" alias="LightModelxvOES"
-              static_dispatch="false" es1="1.0" desktop="false">
+    <function name="LightModelxv"
+              static_dispatch="false" es1="1.0" desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Lightx" alias="LightxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Lightx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Lightxv" alias="LightxvOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Lightxv" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="LineWidthx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="LoadMatrixx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="Materialx" alias="MaterialxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Materialx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Materialxv" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="MultMatrixx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES"
-              static_dispatch="false" es1="1.0" desktop="false">
+    <function name="MultiTexCoord4x"
+              static_dispatch="false" es1="1.0" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -137,15 +137,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3x" alias="Normal3xOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Normal3x" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
-    <function name="Orthox" alias="OrthoxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Orthox" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -154,69 +154,69 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizex" alias="PointSizexOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="PointSizex" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetx" alias="PolygonOffsetxOES"
-              static_dispatch="false" es1="1.0" desktop="false">
+    <function name="PolygonOffsetx"
+              static_dispatch="false" es1="1.0" desktop="false" offset="assign">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="Rotatex" alias="RotatexOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Rotatex" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="SampleCoveragex" alias="SampleCoveragexOES"
-              static_dispatch="false" es1="1.0" desktop="false">
+    <function name="SampleCoveragex"
+              static_dispatch="false" es1="1.0" desktop="false" offset="assign">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="Scalex" alias="ScalexOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Scalex" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="TexEnvx" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="TexEnvxv" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="TexParameterx" alias="TexParameterxOES"
-              static_dispatch="false" es1="1.0" desktop="false">
+    <function name="TexParameterx"
+              static_dispatch="false" es1="1.0" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Translatex" alias="TranslatexOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Translatex" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="Frustumf" alias="FrustumfOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Frustumf" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -225,8 +225,8 @@
         <param name="zFar" type="GLfloat"/>
     </function>
 
-    <function name="Orthof" alias="OrthofOES" static_dispatch="false"
-              es1="1.0" desktop="false">
+    <function name="Orthof" static_dispatch="false"
+              es1="1.0" desktop="false" offset="assign">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -238,80 +238,80 @@
 
 <category name="es1.1">
     <!-- from GL_OES_fixed_point -->
-    <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false"
-              es1="1.1" desktop="false">
+    <function name="ClipPlanex" static_dispatch="false"
+              es1="1.1" desktop="false" offset="assign">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
-    <function name="GetClipPlanex" alias="GetClipPlanexOES"
-              static_dispatch="false" es1="1.1">
+    <function name="GetClipPlanex"
+              static_dispatch="false" es1="1.1" offset="assign">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
-    <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false"
-              es1="1.1" desktop="false">
+    <function name="GetFixedv" static_dispatch="false"
+              es1="1.1" desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false"
-              es1="1.1" desktop="false">
+    <function name="GetLightxv" static_dispatch="false"
+              es1="1.1" desktop="false" offset="assign">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetMaterialxv" alias="GetMaterialxvOES"
-              static_dispatch="false" es1="1.1" desktop="false">
+    <function name="GetMaterialxv"
+              static_dispatch="false" es1="1.1" desktop="false" offset="assign">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false"
-              es1="1.1" desktop="false">
+    <function name="GetTexEnvxv" static_dispatch="false"
+              es1="1.1" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexParameterxv" alias="GetTexParameterxvOES"
-              static_dispatch="false" es1="1.1" desktop="false">
+    <function name="GetTexParameterxv"
+              static_dispatch="false" es1="1.1" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="PointParameterx" alias="PointParameterxOES"
-              static_dispatch="false" es1="1.1" desktop="false">
+    <function name="PointParameterx"
+              static_dispatch="false" es1="1.1" desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxv" alias="PointParameterxvOES"
-              static_dispatch="false" es1="1.1" desktop="false">
+    <function name="PointParameterxv"
+              static_dispatch="false" es1="1.1" desktop="false" offset="assign">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxv" alias="TexParameterxvOES"
-              static_dispatch="false" es1="1.1" desktop="false">
+    <function name="TexParameterxv"
+              static_dispatch="false" es1="1.1" desktop="false" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false"
-              es1="1.1" desktop="false">
+    <function name="ClipPlanef" static_dispatch="false"
+              es1="1.1" desktop="false" offset="assign">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfloat *" count="4"/>
     </function>
 
-    <function name="GetClipPlanef" alias="GetClipPlanefOES"
-              static_dispatch="false" es1="1.1">
+    <function name="GetClipPlanef"
+              static_dispatch="false" es1="1.1" offset="assign">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfloat *" output="true" count="4"/>
     </function>
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py
index adfa5957e..9b716894c 100644
--- a/mesalib/src/mapi/glapi/gen/gl_genexec.py
+++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py
@@ -32,10 +32,7 @@ import sys, getopt
 
 
 exec_flavor_map = {
-    'check': '_check_',
     'dynamic': None,
-    'es': '_es_',
-    'loopback': 'loopback_',
     'mesa': '_mesa_',
     'skip': None,
     }
@@ -189,7 +186,7 @@ class PrintCode(gl_XML.gl_print_base):
                 # dynamically.
                 continue
             settings_by_condition[condition].append(
-                'SET_{0}(exec, {1}{2});'.format(f.name, prefix, f.mesa_name))
+                'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name))
         # Print out an if statement for each unique condition, with
         # the SET_* calls nested inside it.
         for condition in sorted(settings_by_condition.keys()):
-- 
cgit v1.2.3