X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmapi%2Fglapi%2Fgen%2Fgl_API.xml;h=9129d57902db4b9dc294d227d08c9948fbc52811;hb=b761dfa0c3de4bc69a5b8bdf6cb9f6993ad7173d;hp=e7bb0bade976af9a7fb8307c6ea42a1570465934;hpb=933714aabe5464f6168909738f9ffe712e457f26;p=mesa.git

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index e7bb0bade97..9129d57902d 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1107,52 +1107,53 @@
     <type name="void"    size="1"/>
 
     <type name="DEBUGPROCARB" size="4" pointer="true"/>
+    <type name="DEBUGPROC" size="4" pointer="true"/>
 
-    <function name="NewList" offset="0">
+    <function name="NewList" offset="0" deprecated="3.1">
         <param name="list" type="GLuint"/>
         <param name="mode" type="GLenum"/>
         <glx sop="101"/>
     </function>
 
-    <function name="EndList" offset="1">
+    <function name="EndList" offset="1" deprecated="3.1">
         <glx sop="102"/>
     </function>
 
-    <function name="CallList" offset="2">
+    <function name="CallList" offset="2" deprecated="3.1">
         <param name="list" type="GLuint"/>
         <glx rop="1"/>
     </function>
 
-    <function name="CallLists" offset="3">
+    <function name="CallLists" offset="3" deprecated="3.1">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="type" type="GLenum"/>
         <param name="lists" type="const GLvoid *" variable_param="type" count="n"/>
         <glx rop="2" large="true"/>
     </function>
 
-    <function name="DeleteLists" offset="4">
+    <function name="DeleteLists" offset="4" deprecated="3.1">
         <param name="list" type="GLuint"/>
         <param name="range" type="GLsizei"/>
         <glx sop="103"/>
     </function>
 
-    <function name="GenLists" offset="5">
+    <function name="GenLists" offset="5" deprecated="3.1">
         <param name="range" type="GLsizei"/>
         <return type="GLuint"/>
         <glx sop="104"/>
     </function>
 
-    <function name="ListBase" offset="6">
+    <function name="ListBase" offset="6" deprecated="3.1">
         <param name="base" type="GLuint"/>
         <glx rop="3"/>
     </function>
 
-    <function name="Begin" offset="7">
+    <function name="Begin" offset="7" deprecated="3.1" exec="dynamic">
         <param name="mode" type="GLenum"/>
         <glx rop="4"/>
     </function>
 
-    <function name="Bitmap" offset="8">
+    <function name="Bitmap" offset="8" deprecated="3.1">
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="xorig" type="GLfloat"/>
@@ -1163,922 +1164,994 @@
         <glx rop="5" large="true"/>
     </function>
 
-    <function name="Color3b" offset="9" vectorequiv="Color3bv">
+    <function name="Color3b" offset="9" vectorequiv="Color3bv"
+              deprecated="3.1">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="Color3bv" offset="10">
+    <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">
+    <function name="Color3d" offset="11" vectorequiv="Color3dv"
+              deprecated="3.1">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="Color3dv" offset="12">
+    <function name="Color3dv" offset="12" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="7"/>
     </function>
 
-    <function name="Color3f" offset="13" vectorequiv="Color3fv">
+    <function name="Color3f" offset="13" vectorequiv="Color3fv"
+              deprecated="3.1" exec="dynamic">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
     </function>
 
-    <function name="Color3fv" offset="14">
+    <function name="Color3fv" offset="14" deprecated="3.1" exec="dynamic">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="8"/>
     </function>
 
-    <function name="Color3i" offset="15" vectorequiv="Color3iv">
+    <function name="Color3i" offset="15" vectorequiv="Color3iv"
+              deprecated="3.1">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="Color3iv" offset="16">
+    <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">
+    <function name="Color3s" offset="17" vectorequiv="Color3sv"
+              deprecated="3.1">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="Color3sv" offset="18">
+    <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">
+    <function name="Color3ub" offset="19" vectorequiv="Color3ubv"
+              deprecated="3.1">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="Color3ubv" offset="20">
+    <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">
+    <function name="Color3ui" offset="21" vectorequiv="Color3uiv"
+              deprecated="3.1">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="Color3uiv" offset="22">
+    <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">
+    <function name="Color3us" offset="23" vectorequiv="Color3usv"
+              deprecated="3.1">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="Color3usv" offset="24">
+    <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">
+    <function name="Color4b" offset="25" vectorequiv="Color4bv"
+              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">
+    <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">
+    <function name="Color4d" offset="27" vectorequiv="Color4dv"
+              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">
+    <function name="Color4dv" offset="28" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="15"/>
     </function>
 
-    <function name="Color4f" offset="29" vectorequiv="Color4fv">
+    <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0"
+              deprecated="3.1" exec="dynamic">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
         <param name="alpha" type="GLfloat"/>
     </function>
 
-    <function name="Color4fv" offset="30">
+    <function name="Color4fv" offset="30" deprecated="3.1" exec="dynamic">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="16"/>
     </function>
 
-    <function name="Color4i" offset="31" vectorequiv="Color4iv">
+    <function name="Color4i" offset="31" vectorequiv="Color4iv"
+              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">
+    <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">
+    <function name="Color4s" offset="33" vectorequiv="Color4sv"
+              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">
+    <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">
+    <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1"
+              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">
+    <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">
+    <function name="Color4ui" offset="37" vectorequiv="Color4uiv"
+              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">
+    <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">
+    <function name="Color4us" offset="39" vectorequiv="Color4usv"
+              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">
+    <function name="Color4usv" offset="40" deprecated="3.1">
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="21"/>
     </function>
 
-    <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv">
+    <function name="EdgeFlag" offset="41" vectorequiv="EdgeFlagv"
+              deprecated="3.1" exec="dynamic">
         <param name="flag" type="GLboolean"/>
     </function>
 
-    <function name="EdgeFlagv" offset="42">
+    <function name="EdgeFlagv" offset="42" deprecated="3.1">
         <param name="flag" type="const GLboolean *" count="1"/>
         <glx rop="22"/>
     </function>
 
-    <function name="End" offset="43">
+    <function name="End" offset="43" deprecated="3.1" exec="dynamic">
         <glx rop="23"/>
     </function>
 
-    <function name="Indexd" offset="44" vectorequiv="Indexdv">
+    <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1">
         <param name="c" type="GLdouble"/>
     </function>
 
-    <function name="Indexdv" offset="45">
+    <function name="Indexdv" offset="45" deprecated="3.1">
         <param name="c" type="const GLdouble *" count="1"/>
         <glx rop="24"/>
     </function>
 
-    <function name="Indexf" offset="46" vectorequiv="Indexfv">
+    <function name="Indexf" offset="46" vectorequiv="Indexfv" deprecated="3.1"
+              exec="dynamic">
         <param name="c" type="GLfloat"/>
     </function>
 
-    <function name="Indexfv" offset="47">
+    <function name="Indexfv" offset="47" deprecated="3.1" exec="dynamic">
         <param name="c" type="const GLfloat *" count="1"/>
         <glx rop="25"/>
     </function>
 
-    <function name="Indexi" offset="48" vectorequiv="Indexiv">
+    <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1">
         <param name="c" type="GLint"/>
     </function>
 
-    <function name="Indexiv" offset="49">
+    <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">
+    <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1">
         <param name="c" type="GLshort"/>
     </function>
 
-    <function name="Indexsv" offset="51">
+    <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">
+    <function name="Normal3b" offset="52" vectorequiv="Normal3bv"
+              deprecated="3.1">
         <param name="nx" type="GLbyte"/>
         <param name="ny" type="GLbyte"/>
         <param name="nz" type="GLbyte"/>
     </function>
 
-    <function name="Normal3bv" offset="53">
+    <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">
+    <function name="Normal3d" offset="54" vectorequiv="Normal3dv"
+              deprecated="3.1">
         <param name="nx" type="GLdouble"/>
         <param name="ny" type="GLdouble"/>
         <param name="nz" type="GLdouble"/>
     </function>
 
-    <function name="Normal3dv" offset="55">
+    <function name="Normal3dv" offset="55" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="29"/>
     </function>
 
-    <function name="Normal3f" offset="56" vectorequiv="Normal3fv">
+    <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0"
+              deprecated="3.1" exec="dynamic">
         <param name="nx" type="GLfloat"/>
         <param name="ny" type="GLfloat"/>
         <param name="nz" type="GLfloat"/>
     </function>
 
-    <function name="Normal3fv" offset="57">
+    <function name="Normal3fv" offset="57" deprecated="3.1" exec="dynamic">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="30"/>
     </function>
 
-    <function name="Normal3i" offset="58" vectorequiv="Normal3iv">
+    <function name="Normal3i" offset="58" vectorequiv="Normal3iv"
+              deprecated="3.1">
         <param name="nx" type="GLint"/>
         <param name="ny" type="GLint"/>
         <param name="nz" type="GLint"/>
     </function>
 
-    <function name="Normal3iv" offset="59">
+    <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">
+    <function name="Normal3s" offset="60" vectorequiv="Normal3sv"
+              deprecated="3.1">
         <param name="nx" type="GLshort"/>
         <param name="ny" type="GLshort"/>
         <param name="nz" type="GLshort"/>
     </function>
 
-    <function name="Normal3sv" offset="61">
+    <function name="Normal3sv" offset="61" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="32"/>
     </function>
 
-    <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv">
+    <function name="RasterPos2d" offset="62" vectorequiv="RasterPos2dv"
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="RasterPos2dv" offset="63">
+    <function name="RasterPos2dv" offset="63" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="33"/>
     </function>
 
-    <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv">
+    <function name="RasterPos2f" offset="64" vectorequiv="RasterPos2fv"
+              deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="RasterPos2fv" offset="65">
+    <function name="RasterPos2fv" offset="65" deprecated="3.1">
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="34"/>
     </function>
 
-    <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv">
+    <function name="RasterPos2i" offset="66" vectorequiv="RasterPos2iv"
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="RasterPos2iv" offset="67">
+    <function name="RasterPos2iv" offset="67" deprecated="3.1">
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="35"/>
     </function>
 
-    <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv">
+    <function name="RasterPos2s" offset="68" vectorequiv="RasterPos2sv"
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="RasterPos2sv" offset="69">
+    <function name="RasterPos2sv" offset="69" deprecated="3.1">
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="36"/>
     </function>
 
-    <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv">
+    <function name="RasterPos3d" offset="70" vectorequiv="RasterPos3dv"
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="RasterPos3dv" offset="71">
+    <function name="RasterPos3dv" offset="71" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="37"/>
     </function>
 
-    <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv">
+    <function name="RasterPos3f" offset="72" vectorequiv="RasterPos3fv"
+              deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="RasterPos3fv" offset="73">
+    <function name="RasterPos3fv" offset="73" deprecated="3.1">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="38"/>
     </function>
 
-    <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv">
+    <function name="RasterPos3i" offset="74" vectorequiv="RasterPos3iv"
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="RasterPos3iv" offset="75">
+    <function name="RasterPos3iv" offset="75" deprecated="3.1">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="39"/>
     </function>
 
-    <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv">
+    <function name="RasterPos3s" offset="76" vectorequiv="RasterPos3sv"
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="RasterPos3sv" offset="77">
+    <function name="RasterPos3sv" offset="77" deprecated="3.1">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="40"/>
     </function>
 
-    <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv">
+    <function name="RasterPos4d" offset="78" vectorequiv="RasterPos4dv"
+              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="RasterPos4dv" offset="79">
+    <function name="RasterPos4dv" offset="79" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="41"/>
     </function>
 
-    <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv">
+    <function name="RasterPos4f" offset="80" vectorequiv="RasterPos4fv"
+              deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="RasterPos4fv" offset="81">
+    <function name="RasterPos4fv" offset="81" deprecated="3.1">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="42"/>
     </function>
 
-    <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv">
+    <function name="RasterPos4i" offset="82" vectorequiv="RasterPos4iv"
+              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="RasterPos4iv" offset="83">
+    <function name="RasterPos4iv" offset="83" deprecated="3.1">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="43"/>
     </function>
 
-    <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv">
+    <function name="RasterPos4s" offset="84" vectorequiv="RasterPos4sv"
+              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="RasterPos4sv" offset="85">
+    <function name="RasterPos4sv" offset="85" deprecated="3.1">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="44"/>
     </function>
 
-    <function name="Rectd" offset="86" vectorequiv="Rectdv">
+    <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">
+    <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"/>
     </function>
 
-    <function name="Rectf" offset="88" vectorequiv="Rectfv">
+    <function name="Rectf" offset="88" vectorequiv="Rectfv" deprecated="3.1"
+              exec="dynamic">
         <param name="x1" type="GLfloat"/>
         <param name="y1" type="GLfloat"/>
         <param name="x2" type="GLfloat"/>
         <param name="y2" type="GLfloat"/>
     </function>
 
-    <function name="Rectfv" offset="89">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv"
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord1dv" offset="95">
+    <function name="TexCoord1dv" offset="95" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="49"/>
     </function>
 
-    <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv">
+    <function name="TexCoord1f" offset="96" vectorequiv="TexCoord1fv"
+              deprecated="3.1" exec="dynamic">
         <param name="s" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord1fv" offset="97">
+    <function name="TexCoord1fv" offset="97" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="50"/>
     </function>
 
-    <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv">
+    <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv"
+              deprecated="3.1">
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="TexCoord1iv" offset="99">
+    <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">
+    <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv"
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="TexCoord1sv" offset="101">
+    <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">
+    <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv"
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord2dv" offset="103">
+    <function name="TexCoord2dv" offset="103" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="53"/>
     </function>
 
-    <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv">
+    <function name="TexCoord2f" offset="104" vectorequiv="TexCoord2fv"
+              deprecated="3.1" exec="dynamic">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fv" offset="105">
+    <function name="TexCoord2fv" offset="105" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="54"/>
     </function>
 
-    <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv">
+    <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv"
+              deprecated="3.1">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="TexCoord2iv" offset="107">
+    <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">
+    <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv"
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="TexCoord2sv" offset="109">
+    <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">
+    <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv"
+              deprecated="3.1">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord3dv" offset="111">
+    <function name="TexCoord3dv" offset="111" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="57"/>
     </function>
 
-    <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv">
+    <function name="TexCoord3f" offset="112" vectorequiv="TexCoord3fv"
+              deprecated="3.1" exec="dynamic">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord3fv" offset="113">
+    <function name="TexCoord3fv" offset="113" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="58"/>
     </function>
 
-    <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv">
+    <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv"
+              deprecated="3.1">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="TexCoord3iv" offset="115">
+    <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">
+    <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv"
+              deprecated="3.1">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="TexCoord3sv" offset="117">
+    <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">
+    <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv"
+              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">
+    <function name="TexCoord4dv" offset="119" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="61"/>
     </function>
 
-    <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv">
+    <function name="TexCoord4f" offset="120" vectorequiv="TexCoord4fv"
+              deprecated="3.1" exec="dynamic">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
         <param name="q" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord4fv" offset="121">
+    <function name="TexCoord4fv" offset="121" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="62"/>
     </function>
 
-    <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv">
+    <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv"
+              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">
+    <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">
+    <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv"
+              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">
+    <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">
+    <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv"
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="Vertex2dv" offset="127">
+    <function name="Vertex2dv" offset="127" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="65"/>
     </function>
 
-    <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv">
+    <function name="Vertex2f" offset="128" vectorequiv="Vertex2fv"
+              deprecated="3.1" exec="dynamic">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="Vertex2fv" offset="129">
+    <function name="Vertex2fv" offset="129" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="66"/>
     </function>
 
-    <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv">
+    <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv"
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="Vertex2iv" offset="131">
+    <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">
+    <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv"
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="Vertex2sv" offset="133">
+    <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">
+    <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv"
+              deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="Vertex3dv" offset="135">
+    <function name="Vertex3dv" offset="135" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="69"/>
     </function>
 
-    <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv">
+    <function name="Vertex3f" offset="136" vectorequiv="Vertex3fv"
+              deprecated="3.1" exec="dynamic">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Vertex3fv" offset="137">
+    <function name="Vertex3fv" offset="137" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="70"/>
     </function>
 
-    <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv">
+    <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv"
+              deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="Vertex3iv" offset="139">
+    <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">
+    <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv"
+              deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="Vertex3sv" offset="141">
+    <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">
+    <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv"
+              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">
+    <function name="Vertex4dv" offset="143" deprecated="3.1">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="73"/>
     </function>
 
-    <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv">
+    <function name="Vertex4f" offset="144" vectorequiv="Vertex4fv"
+              deprecated="3.1" exec="dynamic">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="Vertex4fv" offset="145">
+    <function name="Vertex4fv" offset="145" deprecated="3.1"
+              exec="dynamic">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="74"/>
     </function>
 
-    <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv">
+    <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv"
+              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">
+    <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">
+    <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv"
+              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">
+    <function name="Vertex4sv" offset="149" deprecated="3.1">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="76"/>
     </function>
 
-    <function name="ClipPlane" offset="150">
+    <function name="ClipPlane" offset="150" deprecated="3.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLdouble *" count="4"/>
         <glx rop="77"/>
     </function>
 
-    <function name="ColorMaterial" offset="151">
+    <function name="ColorMaterial" offset="151" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="mode" type="GLenum"/>
         <glx rop="78"/>
     </function>
 
-    <function name="CullFace" offset="152">
+    <function name="CullFace" offset="152" es1="1.0" es2="2.0">
         <param name="mode" type="GLenum"/>
         <glx rop="79"/>
     </function>
 
-    <function name="Fogf" offset="153">
+    <function name="Fogf" offset="153" es1="1.0" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="80"/>
     </function>
 
-    <function name="Fogfv" offset="154">
+    <function name="Fogfv" offset="154" es1="1.0" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="81"/>
     </function>
 
-    <function name="Fogi" offset="155">
+    <function name="Fogi" offset="155" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="82"/>
     </function>
 
-    <function name="Fogiv" offset="156">
+    <function name="Fogiv" offset="156" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="83"/>
     </function>
 
-    <function name="FrontFace" offset="157">
+    <function name="FrontFace" offset="157" es1="1.0" es2="2.0">
         <param name="mode" type="GLenum"/>
         <glx rop="84"/>
     </function>
 
-    <function name="Hint" offset="158">
+    <function name="Hint" offset="158" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="mode" type="GLenum"/>
         <glx rop="85"/>
     </function>
 
-    <function name="Lightf" offset="159">
+    <function name="Lightf" offset="159" es1="1.0" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="86"/>
     </function>
 
-    <function name="Lightfv" offset="160">
+    <function name="Lightfv" offset="160" es1="1.0" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="87"/>
     </function>
 
-    <function name="Lighti" offset="161">
+    <function name="Lighti" offset="161" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="88"/>
     </function>
 
-    <function name="Lightiv" offset="162">
+    <function name="Lightiv" offset="162" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="89"/>
     </function>
 
-    <function name="LightModelf" offset="163">
+    <function name="LightModelf" offset="163" es1="1.0" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="90"/>
     </function>
 
-    <function name="LightModelfv" offset="164">
+    <function name="LightModelfv" offset="164" es1="1.0" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="91"/>
     </function>
 
-    <function name="LightModeli" offset="165">
+    <function name="LightModeli" offset="165" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="92"/>
     </function>
 
-    <function name="LightModeliv" offset="166">
+    <function name="LightModeliv" offset="166" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="93"/>
     </function>
 
-    <function name="LineStipple" offset="167">
+    <function name="LineStipple" offset="167" deprecated="3.1">
         <param name="factor" type="GLint"/>
         <param name="pattern" type="GLushort"/>
         <glx rop="94"/>
     </function>
 
-    <function name="LineWidth" offset="168">
+    <function name="LineWidth" offset="168" es1="1.0" es2="2.0">
         <param name="width" type="GLfloat"/>
         <glx rop="95"/>
     </function>
 
-    <function name="Materialf" offset="169">
+    <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"/>
         <glx rop="96"/>
     </function>
 
-    <function name="Materialfv" offset="170">
+    <function name="Materialfv" offset="170" es1="1.0" deprecated="3.1"
+              exec="dynamic">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="97"/>
     </function>
 
-    <function name="Materiali" offset="171">
+    <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">
+    <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"/>
         <glx rop="99"/>
     </function>
 
-    <function name="PointSize" offset="173">
+    <function name="PointSize" offset="173" es1="1.0">
         <param name="size" type="GLfloat"/>
         <glx rop="100"/>
     </function>
@@ -2089,12 +2162,12 @@
         <glx rop="101"/>
     </function>
 
-    <function name="PolygonStipple" offset="175">
+    <function name="PolygonStipple" offset="175" deprecated="3.1">
         <param name="mask" type="const GLubyte *" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP" img_target="0" img_pad_dimensions="false"/>
         <glx rop="102"/>
     </function>
 
-    <function name="Scissor" offset="176">
+    <function name="Scissor" offset="176" es1="1.0" es2="2.0">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -2102,33 +2175,33 @@
         <glx rop="103"/>
     </function>
 
-    <function name="ShadeModel" offset="177">
+    <function name="ShadeModel" offset="177" es1="1.0" deprecated="3.1">
         <param name="mode" type="GLenum"/>
         <glx rop="104"/>
     </function>
 
-    <function name="TexParameterf" offset="178">
+    <function name="TexParameterf" offset="178" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="105"/>
     </function>
 
-    <function name="TexParameterfv" offset="179">
+    <function name="TexParameterfv" offset="179" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="106"/>
     </function>
 
-    <function name="TexParameteri" offset="180">
+    <function name="TexParameteri" offset="180" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="107"/>
     </function>
 
-    <function name="TexParameteriv" offset="181">
+    <function name="TexParameteriv" offset="181" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
@@ -2147,7 +2220,7 @@
         <glx rop="109" large="true"/>
     </function>
 
-    <function name="TexImage2D" offset="183">
+    <function name="TexImage2D" offset="183" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -2160,114 +2233,114 @@
         <glx rop="110" large="true"/>
     </function>
 
-    <function name="TexEnvf" offset="184">
+    <function name="TexEnvf" offset="184" es1="1.0" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="111"/>
     </function>
 
-    <function name="TexEnvfv" offset="185">
+    <function name="TexEnvfv" offset="185" es1="1.0" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="112"/>
     </function>
 
-    <function name="TexEnvi" offset="186">
+    <function name="TexEnvi" offset="186" es1="1.1" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="113"/>
     </function>
 
-    <function name="TexEnviv" offset="187">
+    <function name="TexEnviv" offset="187" es1="1.1" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="114"/>
     </function>
 
-    <function name="TexGend" offset="188">
+    <function name="TexGend" offset="188" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLdouble"/>
         <glx rop="115"/>
     </function>
 
-    <function name="TexGendv" offset="189">
+    <function name="TexGendv" offset="189" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLdouble *" variable_param="pname"/>
         <glx rop="116"/>
     </function>
 
-    <function name="TexGenf" offset="190">
+    <function name="TexGenf" offset="190" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="117"/>
     </function>
 
-    <function name="TexGenfv" offset="191">
+    <function name="TexGenfv" offset="191" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="118"/>
     </function>
 
-    <function name="TexGeni" offset="192">
+    <function name="TexGeni" offset="192" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="119"/>
     </function>
 
-    <function name="TexGeniv" offset="193">
+    <function name="TexGeniv" offset="193" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="120"/>
     </function>
 
-    <function name="FeedbackBuffer" offset="194">
+    <function name="FeedbackBuffer" offset="194" deprecated="3.1">
         <param name="size" type="GLsizei"/>
         <param name="type" type="GLenum"/>
         <param name="buffer" type="GLfloat *" output="true"/>
         <glx sop="105" handcode="true"/>
     </function>
 
-    <function name="SelectBuffer" offset="195">
+    <function name="SelectBuffer" offset="195" deprecated="3.1">
         <param name="size" type="GLsizei"/>
         <param name="buffer" type="GLuint *" output="true"/>
         <glx sop="106" handcode="true"/>
     </function>
 
-    <function name="RenderMode" offset="196">
+    <function name="RenderMode" offset="196" deprecated="3.1">
         <param name="mode" type="GLenum"/>
         <return type="GLint"/>
         <glx sop="107" handcode="true"/>
     </function>
 
-    <function name="InitNames" offset="197">
+    <function name="InitNames" offset="197" deprecated="3.1">
         <glx rop="121"/>
     </function>
 
-    <function name="LoadName" offset="198">
+    <function name="LoadName" offset="198" deprecated="3.1">
         <param name="name" type="GLuint"/>
         <glx rop="122"/>
     </function>
 
-    <function name="PassThrough" offset="199">
+    <function name="PassThrough" offset="199" deprecated="3.1">
         <param name="token" type="GLfloat"/>
         <glx rop="123"/>
     </function>
 
-    <function name="PopName" offset="200">
+    <function name="PopName" offset="200" deprecated="3.1">
         <glx rop="124"/>
     </function>
 
-    <function name="PushName" offset="201">
+    <function name="PushName" offset="201" deprecated="3.1">
         <param name="name" type="GLuint"/>
         <glx rop="125"/>
     </function>
@@ -2277,12 +2350,12 @@
         <glx rop="126"/>
     </function>
 
-    <function name="Clear" offset="203">
+    <function name="Clear" offset="203" es1="1.0" es2="2.0">
         <param name="mask" type="GLbitfield"/>
         <glx rop="127"/>
     </function>
 
-    <function name="ClearAccum" offset="204">
+    <function name="ClearAccum" offset="204" deprecated="3.1">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
@@ -2290,12 +2363,12 @@
         <glx rop="128"/>
     </function>
 
-    <function name="ClearIndex" offset="205">
+    <function name="ClearIndex" offset="205" deprecated="3.1">
         <param name="c" type="GLfloat"/>
         <glx rop="129"/>
     </function>
 
-    <function name="ClearColor" offset="206">
+    <function name="ClearColor" offset="206" es1="1.0" es2="2.0">
         <param name="red" type="GLclampf"/>
         <param name="green" type="GLclampf"/>
         <param name="blue" type="GLclampf"/>
@@ -2303,7 +2376,7 @@
         <glx rop="130"/>
     </function>
 
-    <function name="ClearStencil" offset="207">
+    <function name="ClearStencil" offset="207" es1="1.0" es2="2.0">
         <param name="s" type="GLint"/>
         <glx rop="131"/>
     </function>
@@ -2313,12 +2386,12 @@
         <glx rop="132"/>
     </function>
 
-    <function name="StencilMask" offset="209">
+    <function name="StencilMask" offset="209" es1="1.0" es2="2.0">
         <param name="mask" type="GLuint"/>
         <glx rop="133"/>
     </function>
 
-    <function name="ColorMask" offset="210">
+    <function name="ColorMask" offset="210" es1="1.0" es2="2.0">
         <param name="red" type="GLboolean"/>
         <param name="green" type="GLboolean"/>
         <param name="blue" type="GLboolean"/>
@@ -2326,50 +2399,50 @@
         <glx rop="134"/>
     </function>
 
-    <function name="DepthMask" offset="211">
+    <function name="DepthMask" offset="211" es1="1.0" es2="2.0">
         <param name="flag" type="GLboolean"/>
         <glx rop="135"/>
     </function>
 
-    <function name="IndexMask" offset="212">
+    <function name="IndexMask" offset="212" deprecated="3.1">
         <param name="mask" type="GLuint"/>
         <glx rop="136"/>
     </function>
 
-    <function name="Accum" offset="213">
+    <function name="Accum" offset="213" deprecated="3.1">
         <param name="op" type="GLenum"/>
         <param name="value" type="GLfloat"/>
         <glx rop="137"/>
     </function>
 
-    <function name="Disable" offset="214">
+    <function name="Disable" offset="214" es1="1.0" es2="2.0">
         <param name="cap" type="GLenum"/>
         <glx rop="138" handcode="client"/>
     </function>
 
-    <function name="Enable" offset="215">
+    <function name="Enable" offset="215" es1="1.0" es2="2.0">
         <param name="cap" type="GLenum"/>
         <glx rop="139" handcode="client"/>
     </function>
 
-    <function name="Finish" offset="216">
+    <function name="Finish" offset="216" es1="1.0" es2="2.0">
         <glx sop="108" handcode="true"/>
     </function>
 
-    <function name="Flush" offset="217">
+    <function name="Flush" offset="217" es1="1.0" es2="2.0">
         <glx sop="142" handcode="true"/>
     </function>
 
-    <function name="PopAttrib" offset="218">
+    <function name="PopAttrib" offset="218" deprecated="3.1">
         <glx rop="141"/>
     </function>
 
-    <function name="PushAttrib" offset="219">
+    <function name="PushAttrib" offset="219" deprecated="3.1">
         <param name="mask" type="GLbitfield"/>
         <glx rop="142"/>
     </function>
 
-    <function name="Map1d" offset="220">
+    <function name="Map1d" offset="220" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLdouble"/>
         <param name="u2" type="GLdouble"/>
@@ -2379,7 +2452,7 @@
         <glx rop="143" handcode="true"/>
     </function>
 
-    <function name="Map1f" offset="221">
+    <function name="Map1f" offset="221" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLfloat"/>
         <param name="u2" type="GLfloat"/>
@@ -2389,7 +2462,7 @@
         <glx rop="144" handcode="true"/>
     </function>
 
-    <function name="Map2d" offset="222">
+    <function name="Map2d" offset="222" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLdouble"/>
         <param name="u2" type="GLdouble"/>
@@ -2403,7 +2476,7 @@
         <glx rop="145" handcode="true"/>
     </function>
 
-    <function name="Map2f" offset="223">
+    <function name="Map2f" offset="223" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLfloat"/>
         <param name="u2" type="GLfloat"/>
@@ -2417,21 +2490,21 @@
         <glx rop="146" handcode="true"/>
     </function>
 
-    <function name="MapGrid1d" offset="224">
+    <function name="MapGrid1d" offset="224" deprecated="3.1">
         <param name="un" type="GLint"/>
         <param name="u1" type="GLdouble"/>
         <param name="u2" type="GLdouble"/>
         <glx rop="147"/>
     </function>
 
-    <function name="MapGrid1f" offset="225">
+    <function name="MapGrid1f" offset="225" deprecated="3.1">
         <param name="un" type="GLint"/>
         <param name="u1" type="GLfloat"/>
         <param name="u2" type="GLfloat"/>
         <glx rop="148"/>
     </function>
 
-    <function name="MapGrid2d" offset="226">
+    <function name="MapGrid2d" offset="226" deprecated="3.1">
         <param name="un" type="GLint"/>
         <param name="u1" type="GLdouble"/>
         <param name="u2" type="GLdouble"/>
@@ -2441,7 +2514,7 @@
         <glx rop="149"/>
     </function>
 
-    <function name="MapGrid2f" offset="227">
+    <function name="MapGrid2f" offset="227" deprecated="3.1">
         <param name="un" type="GLint"/>
         <param name="u1" type="GLfloat"/>
         <param name="u2" type="GLfloat"/>
@@ -2451,57 +2524,64 @@
         <glx rop="150"/>
     </function>
 
-    <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv">
+    <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv"
+              deprecated="3.1">
         <param name="u" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord1dv" offset="229">
+    <function name="EvalCoord1dv" offset="229" deprecated="3.1">
         <param name="u" type="const GLdouble *" count="1"/>
         <glx rop="151"/>
     </function>
 
-    <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv">
+    <function name="EvalCoord1f" offset="230" vectorequiv="EvalCoord1fv"
+              deprecated="3.1" exec="dynamic">
         <param name="u" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord1fv" offset="231">
+    <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">
+    <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv"
+              deprecated="3.1">
         <param name="u" type="GLdouble"/>
         <param name="v" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord2dv" offset="233">
+    <function name="EvalCoord2dv" offset="233" deprecated="3.1">
         <param name="u" type="const GLdouble *" count="2"/>
         <glx rop="153"/>
     </function>
 
-    <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv">
+    <function name="EvalCoord2f" offset="234" vectorequiv="EvalCoord2fv"
+              deprecated="3.1" exec="dynamic">
         <param name="u" type="GLfloat"/>
         <param name="v" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord2fv" offset="235">
+    <function name="EvalCoord2fv" offset="235" deprecated="3.1">
         <param name="u" type="const GLfloat *" count="2"/>
         <glx rop="154"/>
     </function>
 
-    <function name="EvalMesh1" offset="236">
+    <function name="EvalMesh1" offset="236" deprecated="3.1"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="i1" type="GLint"/>
         <param name="i2" type="GLint"/>
         <glx rop="155"/>
     </function>
 
-    <function name="EvalPoint1" offset="237">
+    <function name="EvalPoint1" offset="237" deprecated="3.1"
+              exec="dynamic">
         <param name="i" type="GLint"/>
         <glx rop="156"/>
     </function>
 
-    <function name="EvalMesh2" offset="238">
+    <function name="EvalMesh2" offset="238" deprecated="3.1"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="i1" type="GLint"/>
         <param name="i2" type="GLint"/>
@@ -2510,61 +2590,62 @@
         <glx rop="157"/>
     </function>
 
-    <function name="EvalPoint2" offset="239">
+    <function name="EvalPoint2" offset="239" deprecated="3.1"
+              exec="dynamic">
         <param name="i" type="GLint"/>
         <param name="j" type="GLint"/>
         <glx rop="158"/>
     </function>
 
-    <function name="AlphaFunc" offset="240">
+    <function name="AlphaFunc" offset="240" es1="1.0" deprecated="3.1">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampf"/>
         <glx rop="159"/>
     </function>
 
-    <function name="BlendFunc" offset="241">
+    <function name="BlendFunc" offset="241" es1="1.0" es2="2.0">
         <param name="sfactor" type="GLenum"/>
         <param name="dfactor" type="GLenum"/>
         <glx rop="160"/>
     </function>
 
-    <function name="LogicOp" offset="242">
+    <function name="LogicOp" offset="242" es1="1.0">
         <param name="opcode" type="GLenum"/>
         <glx rop="161"/>
     </function>
 
-    <function name="StencilFunc" offset="243">
+    <function name="StencilFunc" offset="243" es1="1.0" es2="2.0">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLint"/>
         <param name="mask" type="GLuint"/>
         <glx rop="162"/>
     </function>
 
-    <function name="StencilOp" offset="244">
+    <function name="StencilOp" offset="244" es1="1.0" es2="2.0">
         <param name="fail" type="GLenum"/>
         <param name="zfail" type="GLenum"/>
         <param name="zpass" type="GLenum"/>
         <glx rop="163"/>
     </function>
 
-    <function name="DepthFunc" offset="245">
+    <function name="DepthFunc" offset="245" es1="1.0" es2="2.0">
         <param name="func" type="GLenum"/>
         <glx rop="164"/>
     </function>
 
-    <function name="PixelZoom" offset="246">
+    <function name="PixelZoom" offset="246" deprecated="3.1">
         <param name="xfactor" type="GLfloat"/>
         <param name="yfactor" type="GLfloat"/>
         <glx rop="165"/>
     </function>
 
-    <function name="PixelTransferf" offset="247">
+    <function name="PixelTransferf" offset="247" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="166"/>
     </function>
 
-    <function name="PixelTransferi" offset="248">
+    <function name="PixelTransferi" offset="248" deprecated="3.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="167"/>
@@ -2576,39 +2657,39 @@
         <glx sop="109" handcode="client"/>
     </function>
 
-    <function name="PixelStorei" offset="250">
+    <function name="PixelStorei" offset="250" es1="1.0" es2="2.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx sop="110" handcode="client"/>
     </function>
 
-    <function name="PixelMapfv" offset="251">
+    <function name="PixelMapfv" offset="251" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLfloat *" count="mapsize"/>
         <glx rop="168" large="true"/>
     </function>
 
-    <function name="PixelMapuiv" offset="252">
+    <function name="PixelMapuiv" offset="252" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLuint *" count="mapsize"/>
         <glx rop="169" large="true"/>
     </function>
 
-    <function name="PixelMapusv" offset="253">
+    <function name="PixelMapusv" offset="253" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLushort *" count="mapsize"/>
         <glx rop="170" large="true"/>
     </function>
 
-    <function name="ReadBuffer" offset="254">
+    <function name="ReadBuffer" offset="254" es2="3.0">
         <param name="mode" type="GLenum"/>
         <glx rop="171"/>
     </function>
 
-    <function name="CopyPixels" offset="255">
+    <function name="CopyPixels" offset="255" deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -2617,7 +2698,7 @@
         <glx rop="172"/>
     </function>
 
-    <function name="ReadPixels" offset="256">
+    <function name="ReadPixels" offset="256" es1="1.0" es2="2.0">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -2628,7 +2709,7 @@
         <glx sop="111"/>
     </function>
 
-    <function name="DrawPixels" offset="257">
+    <function name="DrawPixels" offset="257" deprecated="3.1">
         <param name="width" type="GLsizei"/>
         <param name="height" type="GLsizei"/>
         <param name="format" type="GLenum"/>
@@ -2637,13 +2718,13 @@
         <glx rop="173" large="true"/>
     </function>
 
-    <function name="GetBooleanv" offset="258">
+    <function name="GetBooleanv" offset="258" es1="1.1" es2="2.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLboolean *" output="true" variable_param="pname"/>
         <glx sop="112" handcode="client"/>
     </function>
 
-    <function name="GetClipPlane" offset="259">
+    <function name="GetClipPlane" offset="259" deprecated="3.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLdouble *" output="true" count="4"/>
         <glx sop="113" always_array="true"/>
@@ -2655,130 +2736,130 @@
         <glx sop="114" handcode="client"/>
     </function>
 
-    <function name="GetError" offset="261">
+    <function name="GetError" offset="261" es1="1.0" es2="2.0">
         <return type="GLenum"/>
         <glx sop="115" handcode="client"/>
     </function>
 
-    <function name="GetFloatv" offset="262">
+    <function name="GetFloatv" offset="262" es1="1.1" es2="2.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="116" handcode="client"/>
     </function>
 
-    <function name="GetIntegerv" offset="263">
+    <function name="GetIntegerv" offset="263" es1="1.0" es2="2.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="117" handcode="client"/>
     </function>
 
-    <function name="GetLightfv" offset="264">
+    <function name="GetLightfv" offset="264" es1="1.1" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="118"/>
     </function>
 
-    <function name="GetLightiv" offset="265">
+    <function name="GetLightiv" offset="265" deprecated="3.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="119"/>
     </function>
 
-    <function name="GetMapdv" offset="266">
+    <function name="GetMapdv" offset="266" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
         <param name="v" type="GLdouble *" output="true" variable_param="target query"/>
         <glx sop="120"/>
     </function>
 
-    <function name="GetMapfv" offset="267">
+    <function name="GetMapfv" offset="267" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
         <param name="v" type="GLfloat *" output="true" variable_param="target query"/>
         <glx sop="121"/>
     </function>
 
-    <function name="GetMapiv" offset="268">
+    <function name="GetMapiv" offset="268" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="query" type="GLenum"/>
         <param name="v" type="GLint *" output="true" variable_param="target query"/>
         <glx sop="122"/>
     </function>
 
-    <function name="GetMaterialfv" offset="269">
+    <function name="GetMaterialfv" offset="269" es1="1.1" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="123"/>
     </function>
 
-    <function name="GetMaterialiv" offset="270">
+    <function name="GetMaterialiv" offset="270" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="124"/>
     </function>
 
-    <function name="GetPixelMapfv" offset="271">
+    <function name="GetPixelMapfv" offset="271" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLfloat *" output="true" variable_param="map"/>
         <glx sop="125"/>
     </function>
 
-    <function name="GetPixelMapuiv" offset="272">
+    <function name="GetPixelMapuiv" offset="272" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLuint *" output="true" variable_param="map"/>
         <glx sop="126"/>
     </function>
 
-    <function name="GetPixelMapusv" offset="273">
+    <function name="GetPixelMapusv" offset="273" deprecated="3.1">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLushort *" output="true" variable_param="map"/>
         <glx sop="127"/>
     </function>
 
-    <function name="GetPolygonStipple" offset="274">
+    <function name="GetPolygonStipple" offset="274" deprecated="3.1">
         <param name="mask" type="GLubyte *" output="true" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/>
         <glx sop="128"/>
     </function>
 
-    <function name="GetString" offset="275">
+    <function name="GetString" offset="275" es1="1.0" es2="2.0">
         <param name="name" type="GLenum"/>
         <return type="const GLubyte *"/>
         <glx sop="129" handcode="true"/>
     </function>
 
-    <function name="GetTexEnvfv" offset="276">
+    <function name="GetTexEnvfv" offset="276" es1="1.1" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="130"/>
     </function>
 
-    <function name="GetTexEnviv" offset="277">
+    <function name="GetTexEnviv" offset="277" es1="1.1" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="131"/>
     </function>
 
-    <function name="GetTexGendv" offset="278">
+    <function name="GetTexGendv" offset="278" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLdouble *" output="true" variable_param="pname"/>
         <glx sop="132"/>
     </function>
 
-    <function name="GetTexGenfv" offset="279">
+    <function name="GetTexGenfv" offset="279" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="133"/>
     </function>
 
-    <function name="GetTexGeniv" offset="280">
+    <function name="GetTexGeniv" offset="280" deprecated="3.1">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
@@ -2794,14 +2875,14 @@
         <glx sop="135" dimensions_in_reply="true"/>
     </function>
 
-    <function name="GetTexParameterfv" offset="282">
+    <function name="GetTexParameterfv" offset="282" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="136"/>
     </function>
 
-    <function name="GetTexParameteriv" offset="283">
+    <function name="GetTexParameteriv" offset="283" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
@@ -2824,13 +2905,13 @@
         <glx sop="139"/>
     </function>
 
-    <function name="IsEnabled" offset="286">
+    <function name="IsEnabled" offset="286" es1="1.1" es2="2.0">
         <param name="cap" type="GLenum"/>
         <return type="GLboolean"/>
         <glx sop="140" handcode="client"/>
     </function>
 
-    <function name="IsList" offset="287">
+    <function name="IsList" offset="287" deprecated="3.1">
         <param name="list" type="GLuint"/>
         <return type="GLboolean"/>
         <glx sop="141"/>
@@ -2842,7 +2923,7 @@
         <glx rop="174"/>
     </function>
 
-    <function name="Frustum" offset="289">
+    <function name="Frustum" offset="289" deprecated="3.1">
         <param name="left" type="GLdouble"/>
         <param name="right" type="GLdouble"/>
         <param name="bottom" type="GLdouble"/>
@@ -2852,36 +2933,36 @@
         <glx rop="175"/>
     </function>
 
-    <function name="LoadIdentity" offset="290">
+    <function name="LoadIdentity" offset="290" es1="1.0" deprecated="3.1">
         <glx rop="176"/>
     </function>
 
-    <function name="LoadMatrixf" offset="291">
+    <function name="LoadMatrixf" offset="291" es1="1.0" deprecated="3.1">
         <param name="m" type="const GLfloat *" count="16"/>
         <glx rop="177"/>
     </function>
 
-    <function name="LoadMatrixd" offset="292">
+    <function name="LoadMatrixd" offset="292" deprecated="3.1">
         <param name="m" type="const GLdouble *" count="16"/>
         <glx rop="178"/>
     </function>
 
-    <function name="MatrixMode" offset="293">
+    <function name="MatrixMode" offset="293" es1="1.0" deprecated="3.1">
         <param name="mode" type="GLenum"/>
         <glx rop="179"/>
     </function>
 
-    <function name="MultMatrixf" offset="294">
+    <function name="MultMatrixf" offset="294" es1="1.0" deprecated="3.1">
         <param name="m" type="const GLfloat *" count="16"/>
         <glx rop="180"/>
     </function>
 
-    <function name="MultMatrixd" offset="295">
+    <function name="MultMatrixd" offset="295" deprecated="3.1">
         <param name="m" type="const GLdouble *" count="16"/>
         <glx rop="181"/>
     </function>
 
-    <function name="Ortho" offset="296">
+    <function name="Ortho" offset="296" deprecated="3.1">
         <param name="left" type="GLdouble"/>
         <param name="right" type="GLdouble"/>
         <param name="bottom" type="GLdouble"/>
@@ -2891,15 +2972,15 @@
         <glx rop="182"/>
     </function>
 
-    <function name="PopMatrix" offset="297">
+    <function name="PopMatrix" offset="297" es1="1.0" deprecated="3.1">
         <glx rop="183"/>
     </function>
 
-    <function name="PushMatrix" offset="298">
+    <function name="PushMatrix" offset="298" es1="1.0" deprecated="3.1">
         <glx rop="184"/>
     </function>
 
-    <function name="Rotated" offset="299">
+    <function name="Rotated" offset="299" deprecated="3.1">
         <param name="angle" type="GLdouble"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -2907,7 +2988,7 @@
         <glx rop="185"/>
     </function>
 
-    <function name="Rotatef" offset="300">
+    <function name="Rotatef" offset="300" es1="1.0" deprecated="3.1">
         <param name="angle" type="GLfloat"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -2915,35 +2996,35 @@
         <glx rop="186"/>
     </function>
 
-    <function name="Scaled" offset="301">
+    <function name="Scaled" offset="301" deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <glx rop="187"/>
     </function>
 
-    <function name="Scalef" offset="302">
+    <function name="Scalef" offset="302" es1="1.0" deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <glx rop="188"/>
     </function>
 
-    <function name="Translated" offset="303">
+    <function name="Translated" offset="303" deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <glx rop="189"/>
     </function>
 
-    <function name="Translatef" offset="304">
+    <function name="Translatef" offset="304" es1="1.0" deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <glx rop="190"/>
     </function>
 
-    <function name="Viewport" offset="305">
+    <function name="Viewport" offset="305" es1="1.0" es2="2.0">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -2981,7 +3062,6 @@
     <enum name="POLYGON_OFFSET_FACTOR"         count="1"  value="0x8038">
         <size name="Get" mode="get"/>
     </enum>
-    <enum name="POLYGON_OFFSET_BIAS"                      value="0x8039"/>
     <enum name="ALPHA4"                                   value="0x803B"/>
     <enum name="ALPHA8"                                   value="0x803C"/>
     <enum name="ALPHA12"                                  value="0x803D"/>
@@ -3127,12 +3207,13 @@
     <enum name="ALL_CLIENT_ATTRIB_BITS"                   value="0xFFFFFFFF"/>
     <enum name="CLIENT_ALL_ATTRIB_BITS"                   value="0xFFFFFFFF"/>
 
-    <function name="ArrayElement" offset="306">
+    <function name="ArrayElement" offset="306" deprecated="3.1"
+              exec="dynamic">
         <param name="i" type="GLint"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="ColorPointer" offset="308">
+    <function name="ColorPointer" offset="308" es1="1.0" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3140,19 +3221,22 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="DisableClientState" offset="309">
+    <function name="DisableClientState" offset="309" es1="1.0"
+              deprecated="3.1">
         <param name="array" type="GLenum"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="DrawArrays" offset="310">
+    <function name="DrawArrays" offset="310" es1="1.0" es2="2.0"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="first" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <glx rop="193" handcode="true"/>
     </function>
 
-    <function name="DrawElements" offset="311">
+    <function name="DrawElements" offset="311" es1="1.0" es2="2.0"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="type" type="GLenum"/>
@@ -3160,45 +3244,45 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="EdgeFlagPointer" offset="312">
+    <function name="EdgeFlagPointer" offset="312" deprecated="3.1">
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="EnableClientState" offset="313">
+    <function name="EnableClientState" offset="313" es1="1.0" deprecated="3.1">
         <param name="array" type="GLenum"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="GetPointerv" offset="329">
+    <function name="GetPointerv" offset="329" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **" output="true"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="IndexPointer" offset="314">
+    <function name="IndexPointer" offset="314" deprecated="3.1">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="InterleavedArrays" offset="317">
+    <function name="InterleavedArrays" offset="317" deprecated="3.1">
         <param name="format" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="NormalPointer" offset="318">
+    <function name="NormalPointer" offset="318" es1="1.0" deprecated="3.1">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
         <glx handcode="true"/>
     </function>
 
-    <function name="TexCoordPointer" offset="320">
+    <function name="TexCoordPointer" offset="320" es1="1.0" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3206,7 +3290,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexPointer" offset="321">
+    <function name="VertexPointer" offset="321" es1="1.0" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3214,7 +3298,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="PolygonOffset" offset="319">
+    <function name="PolygonOffset" offset="319" es1="1.0" es2="2.0">
         <param name="factor" type="GLfloat"/>
         <param name="units" type="GLfloat"/>
         <glx rop="192"/>
@@ -3231,7 +3315,7 @@
         <glx rop="4119"/>
     </function>
 
-    <function name="CopyTexImage2D" offset="324">
+    <function name="CopyTexImage2D" offset="324" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -3253,7 +3337,7 @@
         <glx rop="4121"/>
     </function>
 
-    <function name="CopyTexSubImage2D" offset="326">
+    <function name="CopyTexSubImage2D" offset="326" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -3277,7 +3361,7 @@
         <glx rop="4099" large="true"/>
     </function>
 
-    <function name="TexSubImage2D" offset="333">
+    <function name="TexSubImage2D" offset="333" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -3291,7 +3375,7 @@
         <glx rop="4100" large="true"/>
     </function>
 
-    <function name="AreTexturesResident" offset="322">
+    <function name="AreTexturesResident" offset="322" deprecated="3.1">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="const GLuint *" count="n"/>
         <param name="residences" type="GLboolean *" output="true" count="n"/>
@@ -3299,51 +3383,52 @@
         <glx sop="143" handcode="client" always_array="true"/>
     </function>
 
-    <function name="BindTexture" offset="307">
+    <function name="BindTexture" offset="307" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <glx rop="4117"/>
     </function>
 
-    <function name="DeleteTextures" offset="327">
+    <function name="DeleteTextures" offset="327" es1="1.0" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="const GLuint *" count="n"/>
         <glx sop="144"/>
     </function>
 
-    <function name="GenTextures" offset="328">
+    <function name="GenTextures" offset="328" es1="1.0" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="GLuint *" output="true" count="n"/>
         <glx sop="145" always_array="true"/>
     </function>
 
-    <function name="IsTexture" offset="330">
+    <function name="IsTexture" offset="330" es1="1.1" es2="2.0">
         <param name="texture" type="GLuint"/>
         <return type="GLboolean"/>
         <glx sop="146"/>
     </function>
 
-    <function name="PrioritizeTextures" offset="331">
+    <function name="PrioritizeTextures" offset="331" deprecated="3.1">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="textures" type="const GLuint *" count="n"/>
         <param name="priorities" type="const GLclampf *" count="n"/>
         <glx rop="4118"/>
     </function>
 
-    <function name="Indexub" offset="315" vectorequiv="Indexubv">
+    <function name="Indexub" offset="315" vectorequiv="Indexubv"
+              deprecated="3.1">
         <param name="c" type="GLubyte"/>
     </function>
 
-    <function name="Indexubv" offset="316">
+    <function name="Indexubv" offset="316" deprecated="3.1">
         <param name="c" type="const GLubyte *" count="1"/>
         <glx rop="194"/>
     </function>
 
-    <function name="PopClientAttrib" offset="334">
+    <function name="PopClientAttrib" offset="334" deprecated="3.1">
         <glx handcode="true"/>
     </function>
 
-    <function name="PushClientAttrib" offset="335">
+    <function name="PushClientAttrib" offset="335" deprecated="3.1">
         <param name="mask" type="GLbitfield"/>
         <glx handcode="true"/>
     </function>
@@ -3696,7 +3781,7 @@
     </enum>
 
 
-    <function name="BlendColor" offset="336">
+    <function name="BlendColor" offset="336" es2="2.0">
         <param name="red" type="GLclampf"/>
         <param name="green" type="GLclampf"/>
         <param name="blue" type="GLclampf"/>
@@ -3704,12 +3789,13 @@
         <glx rop="4096"/>
     </function>
 
-    <function name="BlendEquation" offset="337">
+    <function name="BlendEquation" offset="337" es2="2.0">
         <param name="mode" type="GLenum"/>
         <glx rop="4097"/>
     </function>
 
-    <function name="DrawRangeElements" offset="338">
+    <function name="DrawRangeElements" offset="338" es2="3.0"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="start" type="GLuint"/>
         <param name="end" type="GLuint"/>
@@ -3719,7 +3805,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="ColorTable" offset="339">
+    <function name="ColorTable" offset="339" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -3729,21 +3815,21 @@
         <glx rop="2053" large="true"/>
     </function>
 
-    <function name="ColorTableParameterfv" offset="340">
+    <function name="ColorTableParameterfv" offset="340" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="2054"/>
     </function>
 
-    <function name="ColorTableParameteriv" offset="341">
+    <function name="ColorTableParameteriv" offset="341" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="2055"/>
     </function>
 
-    <function name="CopyColorTable" offset="342">
+    <function name="CopyColorTable" offset="342" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="x" type="GLint"/>
@@ -3752,7 +3838,7 @@
         <glx rop="2056"/>
     </function>
 
-    <function name="GetColorTable" offset="343">
+    <function name="GetColorTable" offset="343" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="format" type="GLenum"/>
         <param name="type" type="GLenum"/>
@@ -3760,21 +3846,21 @@
         <glx sop="147" dimensions_in_reply="true"/>
     </function>
 
-    <function name="GetColorTableParameterfv" offset="344">
+    <function name="GetColorTableParameterfv" offset="344" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="148"/>
     </function>
 
-    <function name="GetColorTableParameteriv" offset="345">
+    <function name="GetColorTableParameteriv" offset="345" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="149"/>
     </function>
 
-    <function name="ColorSubTable" offset="346">
+    <function name="ColorSubTable" offset="346" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="start" type="GLsizei"/>
         <param name="count" type="GLsizei"/>
@@ -3784,7 +3870,7 @@
         <glx rop="195" large="true"/>
     </function>
 
-    <function name="CopyColorSubTable" offset="347">
+    <function name="CopyColorSubTable" offset="347" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="start" type="GLsizei"/>
         <param name="x" type="GLint"/>
@@ -3793,7 +3879,7 @@
         <glx rop="196"/>
     </function>
 
-    <function name="ConvolutionFilter1D" offset="348">
+    <function name="ConvolutionFilter1D" offset="348" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -3803,7 +3889,7 @@
         <glx rop="4101" large="true"/>
     </function>
 
-    <function name="ConvolutionFilter2D" offset="349">
+    <function name="ConvolutionFilter2D" offset="349" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -3814,35 +3900,35 @@
         <glx rop="4102" large="true"/>
     </function>
 
-    <function name="ConvolutionParameterf" offset="350">
+    <function name="ConvolutionParameterf" offset="350" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat"/>
         <glx rop="4103"/>
     </function>
 
-    <function name="ConvolutionParameterfv" offset="351">
+    <function name="ConvolutionParameterfv" offset="351" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="4104"/>
     </function>
 
-    <function name="ConvolutionParameteri" offset="352">
+    <function name="ConvolutionParameteri" offset="352" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint"/>
         <glx rop="4105"/>
     </function>
 
-    <function name="ConvolutionParameteriv" offset="353">
+    <function name="ConvolutionParameteriv" offset="353" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="4106"/>
     </function>
 
-    <function name="CopyConvolutionFilter1D" offset="354">
+    <function name="CopyConvolutionFilter1D" offset="354" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="x" type="GLint"/>
@@ -3851,7 +3937,7 @@
         <glx rop="4107"/>
     </function>
 
-    <function name="CopyConvolutionFilter2D" offset="355">
+    <function name="CopyConvolutionFilter2D" offset="355" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="x" type="GLint"/>
@@ -3861,7 +3947,7 @@
         <glx rop="4108"/>
     </function>
 
-    <function name="GetConvolutionFilter" offset="356">
+    <function name="GetConvolutionFilter" offset="356" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="format" type="GLenum"/>
         <param name="type" type="GLenum"/>
@@ -3869,21 +3955,21 @@
         <glx sop="150" dimensions_in_reply="true"/>
     </function>
 
-    <function name="GetConvolutionParameterfv" offset="357">
+    <function name="GetConvolutionParameterfv" offset="357" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="151"/>
     </function>
 
-    <function name="GetConvolutionParameteriv" offset="358">
+    <function name="GetConvolutionParameteriv" offset="358" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="152"/>
     </function>
 
-    <function name="GetSeparableFilter" offset="359">
+    <function name="GetSeparableFilter" offset="359" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="format" type="GLenum"/>
         <param name="type" type="GLenum"/>
@@ -3893,7 +3979,7 @@
         <glx sop="153" handcode="true"/>
     </function>
 
-    <function name="SeparableFilter2D" offset="360">
+    <function name="SeparableFilter2D" offset="360" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -3905,7 +3991,7 @@
         <glx rop="4109" handcode="true"/>
     </function>
 
-    <function name="GetHistogram" offset="361">
+    <function name="GetHistogram" offset="361" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="reset" type="GLboolean"/>
         <param name="format" type="GLenum"/>
@@ -3914,21 +4000,21 @@
         <glx sop="154" dimensions_in_reply="true" img_reset="reset"/>
     </function>
 
-    <function name="GetHistogramParameterfv" offset="362">
+    <function name="GetHistogramParameterfv" offset="362" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="155"/>
     </function>
 
-    <function name="GetHistogramParameteriv" offset="363">
+    <function name="GetHistogramParameteriv" offset="363" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="156"/>
     </function>
 
-    <function name="GetMinmax" offset="364">
+    <function name="GetMinmax" offset="364" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="reset" type="GLboolean"/>
         <param name="format" type="GLenum"/>
@@ -3937,21 +4023,21 @@
         <glx sop="157" img_reset="reset"/>
     </function>
 
-    <function name="GetMinmaxParameterfv" offset="365">
+    <function name="GetMinmaxParameterfv" offset="365" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx sop="158"/>
     </function>
 
-    <function name="GetMinmaxParameteriv" offset="366">
+    <function name="GetMinmaxParameteriv" offset="366" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx sop="159"/>
     </function>
 
-    <function name="Histogram" offset="367">
+    <function name="Histogram" offset="367" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="width" type="GLsizei"/>
         <param name="internalformat" type="GLenum"/>
@@ -3959,24 +4045,24 @@
         <glx rop="4110"/>
     </function>
 
-    <function name="Minmax" offset="368">
+    <function name="Minmax" offset="368" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="sink" type="GLboolean"/>
         <glx rop="4111"/>
     </function>
 
-    <function name="ResetHistogram" offset="369">
+    <function name="ResetHistogram" offset="369" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <glx rop="4112"/>
     </function>
 
-    <function name="ResetMinmax" offset="370">
+    <function name="ResetMinmax" offset="370" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <glx rop="4113"/>
     </function>
 
-    <function name="TexImage3D" offset="371">
+    <function name="TexImage3D" offset="371" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -3990,7 +4076,7 @@
         <glx rop="4114" large="true"/>
     </function>
 
-    <function name="TexSubImage3D" offset="372">
+    <function name="TexSubImage3D" offset="372" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4006,7 +4092,7 @@
         <glx rop="4115" large="true"/>
     </function>
 
-    <function name="CopyTexSubImage3D" offset="373">
+    <function name="CopyTexSubImage3D" offset="373" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4233,147 +4319,185 @@
     <enum name="DOT3_RGB"                                 value="0x86AE"/>
     <enum name="DOT3_RGBA"                                value="0x86AF"/>
 
-    <function name="ActiveTexture" alias="ActiveTextureARB">
+    <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">
+    <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">
+    <function name="MultiTexCoord1d"
+              deprecated="3.1" offset="376">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB">
+    <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">
+    <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB">
+    <function name="MultiTexCoord1fv" alias="MultiTexCoord1fvARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB">
+    <function name="MultiTexCoord1i"
+              deprecated="3.1" offset="380">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB">
+    <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">
+    <function name="MultiTexCoord1s"
+              deprecated="3.1" offset="382">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB">
+    <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">
+    <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">
+    <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">
+    <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB">
+    <function name="MultiTexCoord2fv" alias="MultiTexCoord2fvARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB">
+    <function name="MultiTexCoord3fv" alias="MultiTexCoord3fvARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="MultiTexCoord4d"
+              deprecated="3.1" offset="400">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
@@ -4381,12 +4505,15 @@
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB">
+    <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">
+    <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -4394,12 +4521,14 @@
         <param name="q" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB">
+    <function name="MultiTexCoord4fv" alias="MultiTexCoord4fvARB"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB">
+    <function name="MultiTexCoord4i"
+              deprecated="3.1" offset="404">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
@@ -4407,12 +4536,15 @@
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB">
+    <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">
+    <function name="MultiTexCoord4s"
+              deprecated="3.1" offset="406">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
@@ -4420,33 +4552,45 @@
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB">
+    <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">
+    <function name="LoadTransposeMatrixf"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB">
+    <function name="LoadTransposeMatrixd"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB">
+    <function name="MultTransposeMatrixf"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB">
+    <function name="MultTransposeMatrixd"
+              deprecated="3.1" offset="assign">
         <param name="m" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="SampleCoverage" alias="SampleCoverageARB">
+    <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">
+    <function name="CompressedTexImage3D" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4454,32 +4598,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">
+    <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">
+    <function name="CompressedTexSubImage3D" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4489,11 +4637,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">
+    <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"/>
@@ -4501,24 +4651,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>
 
@@ -4536,19 +4689,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">
@@ -4637,231 +4790,280 @@
     </enum>
     <enum name="COMPARE_R_TO_TEXTURE"                     value="0x884E"/>
 
-    <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT">
+    <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">
+    <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1">
         <param name="coord" type="GLfloat"/>
     </function>
 
-    <function name="FogCoordfv" alias="FogCoordfvEXT">
+    <function name="FogCoordfv" alias="FogCoordfvEXT" deprecated="3.1">
         <param name="coord" type="const GLfloat *"/>
     </function>
 
-    <function name="FogCoordd" alias="FogCoorddEXT">
+    <function name="FogCoordd" deprecated="3.1" offset="assign">
         <param name="coord" type="GLdouble"/>
     </function>
 
-    <function name="FogCoorddv" alias="FogCoorddvEXT">
-        <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">
+    <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">
         <param name="mode" type="GLenum"/>
         <param name="count" type="const GLsizei *"/>
         <param name="type" type="GLenum"/>
-        <param name="indices" type="const GLvoid **"/>
+        <param name="indices" type="const GLvoid * const *"/>
         <param name="primcount" type="GLsizei"/>
     </function>
 
-    <function name="PointParameterf" alias="PointParameterfEXT">
+    <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">
+    <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <function name="SecondaryColor3f" alias="SecondaryColor3fEXT"
+              deprecated="3.1" exec="dynamic">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
     </function>
 
-    <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT">
+    <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT"
+              deprecated="3.1" exec="dynamic">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="SecondaryColor3i" alias="SecondaryColor3iEXT">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
+    <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">
+    <function name="WindowPos2dv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2f" alias="WindowPos2fMESA">
+    <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">
+    <function name="WindowPos2fv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLfloat *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2i" alias="WindowPos2iMESA">
+    <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">
+    <function name="WindowPos2iv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLint *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos2s" alias="WindowPos2sMESA">
+    <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">
+    <function name="WindowPos2sv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLshort *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3d" alias="WindowPos3dMESA">
+    <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">
+    <function name="WindowPos3dv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLdouble *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3f" alias="WindowPos3fMESA">
+    <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">
-        <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">
+    <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">
+    <function name="WindowPos3iv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLint *"/>
+        <glx handcode="true"/>
     </function>
 
-    <function name="WindowPos3s" alias="WindowPos3sMESA">
+    <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">
+    <function name="WindowPos3sv" deprecated="3.1" offset="assign">
         <param name="v" type="const GLshort *"/>
+        <glx handcode="true"/>
     </function>
 </category>
 
@@ -4930,110 +5132,132 @@
     <type name="intptr"   size="4"                  glx_name="CARD32"/>
     <type name="sizeiptr" size="4"  unsigned="true" glx_name="CARD32"/>
 
-    <function name="BindBuffer" alias="BindBufferARB">
+    <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">
+    <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">
+    <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">
-        <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
-        <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">
+    <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">
+    <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">
+    <function name="EndQuery" es2="3.0" offset="assign">
         <param name="target" type="GLenum"/>
+        <glx rop="232"/>
     </function>
 
-    <function name="GetQueryiv" alias="GetQueryivARB">
+    <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">
+    <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>
 
@@ -5123,8 +5347,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"/>
@@ -5132,17 +5356,20 @@
     <enum name="STENCIL_BACK_VALUE_MASK"          value="0x8CA4"/>
     <enum name="STENCIL_BACK_WRITEMASK"           value="0x8CA5"/>
 
-    <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT">
+    <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">
+    <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">
+    <function name="StencilFuncSeparate" offset="assign" es2="2.0">
         <param name="face" type="GLenum"/>
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLint"/>
@@ -5150,7 +5377,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="StencilOpSeparate" offset="assign">
+    <function name="StencilOpSeparate" offset="assign" es2="2.0">
         <param name="face" type="GLenum"/>
         <param name="sfail" type="GLenum"/>
         <param name="zfail" type="GLenum"/>
@@ -5158,68 +5385,74 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="StencilMaskSeparate" offset="assign">
+    <function name="StencilMaskSeparate" offset="assign" es2="2.0">
         <param name="face" type="GLenum"/>
         <param name="mask" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="AttachShader" offset="assign">
+    <function name="AttachShader" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="shader" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="BindAttribLocation" alias="BindAttribLocationARB">
+    <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">
+    <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">
+    <function name="CreateProgram" offset="assign" es2="2.0">
         <return type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="CreateShader" offset="assign">
+    <function name="CreateShader" offset="assign" es2="2.0">
         <param name="type" type="GLenum"/>
         <return type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="DeleteProgram" offset="assign">
+    <function name="DeleteProgram" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="DeleteShader" offset="assign">
+    <function name="DeleteShader" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="DetachShader" offset="assign">
+    <function name="DetachShader" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="shader" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="DisableVertexAttribArray" alias="DisableVertexAttribArrayARB">
+    <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">
+    <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">
+    <function name="GetActiveAttrib" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei "/>
@@ -5228,9 +5461,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">
+    <function name="GetActiveUniform" es2="2.0" offset="assign">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
@@ -5239,9 +5473,10 @@
         <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">
+    <function name="GetAttachedShaders" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="maxCount" type="GLsizei"/>
         <param name="count" type="GLsizei *" output="true"/>
@@ -5249,21 +5484,22 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetAttribLocation" alias="GetAttribLocationARB">
+    <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">
+    <function name="GetProgramiv" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="pname" type="GLenum"/>
-        <param name="params" type="GLint *"/>
+        <param name="params" type="GLint *" output="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetProgramInfoLog" offset="assign">
+    <function name="GetProgramInfoLog" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *"/>
@@ -5271,14 +5507,14 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetShaderiv" offset="assign">
+    <function name="GetShaderiv" offset="assign" es2="2.0">
         <param name="shader" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetShaderInfoLog" offset="assign">
+    <function name="GetShaderInfoLog" offset="assign" es2="2.0">
         <param name="shader" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *"/>
@@ -5286,400 +5522,454 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetShaderSource" alias="GetShaderSourceARB">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="IsProgram" offset="assign" es2="2.0">
         <param name="program" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="IsShader" offset="assign">
+    <function name="IsShader" offset="assign" es2="2.0">
         <param name="shader" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="LinkProgram" alias="LinkProgramARB">
+    <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">
+    <function name="ShaderSource" es2="2.0" offset="assign">
         <param name="shader" type="GLuint"/>
         <param name="count" type="GLsizei"/>
-        <param name="string" type="const GLchar **"/>
+        <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="Uniform1fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLfloat *" count="count"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2fv" alias="Uniform2fvARB">
+    <function name="Uniform2fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="2"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3fv" alias="Uniform3fvARB">
+    <function name="Uniform3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="3"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform4fv" alias="Uniform4fvARB">
+    <function name="Uniform4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="4"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1iv" alias="Uniform1ivARB">
+    <function name="Uniform1iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLint *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLint *" count="count"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2iv" alias="Uniform2ivARB">
+    <function name="Uniform2iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLint *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLint *" count="count" count_scale="2"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3iv" alias="Uniform3ivARB">
+    <function name="Uniform3iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLint *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLint *" count="count" count_scale="3"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform4iv" alias="Uniform4ivARB">
+    <function name="Uniform4iv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
-        <param name="value" type="const GLint *"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="value" type="const GLint *" count="count" count_scale="4"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB">
+    <function name="UniformMatrix2fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="4"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB">
+    <function name="UniformMatrix3fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="9"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB">
+    <function name="UniformMatrix4fv" es2="2.0" offset="assign">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="16"/>
+        <glx ignore="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ValidateProgram" alias="ValidateProgramARB">
+    <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">
+    <function name="VertexAttrib1f" alias="VertexAttrib1fARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
     </function>
-    <function name="VertexAttrib1fv" alias="VertexAttrib1fvARB">
+    <function name="VertexAttrib1fv" alias="VertexAttrib1fvARB" es2="2.0">
         <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">
+    <function name="VertexAttrib2f" alias="VertexAttrib2fARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
-    <function name="VertexAttrib2fv" alias="VertexAttrib2fvARB">
+    <function name="VertexAttrib2fv" alias="VertexAttrib2fvARB" es2="2.0">
         <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">
+    <function name="VertexAttrib3f" alias="VertexAttrib3fARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
-    <function name="VertexAttrib3fv" alias="VertexAttrib3fvARB">
+    <function name="VertexAttrib3fv" alias="VertexAttrib3fvARB" es2="2.0">
         <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">
+    <function name="VertexAttrib4f" alias="VertexAttrib4fARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <param name="w" type="GLfloat"/>
     </function>
-    <function name="VertexAttrib4fv" alias="VertexAttrib4fvARB">
+    <function name="VertexAttrib4fv" alias="VertexAttrib4fvARB" es2="2.0">
         <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">
+    <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>
@@ -5713,46 +6003,46 @@
     <enum name="COMPRESSED_SLUMINANCE"          value="0x8C4A"/>
     <enum name="COMPRESSED_SLUMINANCE_ALPHA"    value="0x8C4B"/>
 
-    <function name="UniformMatrix2x3fv" offset="assign">
+    <function name="UniformMatrix2x3fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="6"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3x2fv" offset="assign">
+    <function name="UniformMatrix3x2fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="6"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix2x4fv" offset="assign">
+    <function name="UniformMatrix2x4fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="6"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4x2fv" offset="assign">
+    <function name="UniformMatrix4x2fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="8"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3x4fv" offset="assign">
+    <function name="UniformMatrix3x4fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="12"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4x3fv" offset="assign">
+    <function name="UniformMatrix4x3fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
-        <param name="count" type="GLsizei"/>
+        <param name="count" type="GLsizei" counter="true"/>
         <param name="transpose" type="GLboolean"/>
-        <param name="value" type="const GLfloat *"/>
+        <param name="value" type="const GLfloat *" count="count" count_scale="12"/>
         <glx ignore="true"/>
     </function>
 
@@ -5804,161 +6094,163 @@
         <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">
+    <function name="MultiTexCoord1dARB"
+              vectorequiv="MultiTexCoord1dv" alias="MultiTexCoord1d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord1dvARB" offset="377">
+    <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" vectorequiv="MultiTexCoord1fvARB">
+    <function name="MultiTexCoord1fARB" offset="378"
+              vectorequiv="MultiTexCoord1fvARB" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord1fvARB" offset="379">
+    <function name="MultiTexCoord1fvARB" offset="379" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="199"/>
     </function>
 
-    <function name="MultiTexCoord1iARB" offset="380" vectorequiv="MultiTexCoord1ivARB">
+    <function name="MultiTexCoord1iARB"
+              vectorequiv="MultiTexCoord1iv" alias="MultiTexCoord1i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord1ivARB" offset="381">
+    <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">
+    <function name="MultiTexCoord1sARB"
+              vectorequiv="MultiTexCoord1sv" alias="MultiTexCoord1s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord1svARB" offset="383">
+    <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">
+    <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">
+    <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" vectorequiv="MultiTexCoord2fvARB">
+    <function name="MultiTexCoord2fARB" offset="386"
+              vectorequiv="MultiTexCoord2fvARB" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord2fvARB" offset="387">
+    <function name="MultiTexCoord2fvARB" offset="387" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="203"/>
     </function>
 
-    <function name="MultiTexCoord2iARB" offset="388" vectorequiv="MultiTexCoord2ivARB">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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" vectorequiv="MultiTexCoord3fvARB">
+    <function name="MultiTexCoord3fARB" offset="394"
+              vectorequiv="MultiTexCoord3fvARB" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord3fvARB" offset="395">
+    <function name="MultiTexCoord3fvARB" offset="395" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="207"/>
     </function>
 
-    <function name="MultiTexCoord3iARB" offset="396" vectorequiv="MultiTexCoord3ivARB">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="MultiTexCoord4dARB"
+              vectorequiv="MultiTexCoord4dv" alias="MultiTexCoord4d">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
@@ -5966,13 +6258,13 @@
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord4dvARB" offset="401">
+    <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" vectorequiv="MultiTexCoord4fvARB">
+    <function name="MultiTexCoord4fARB" offset="402"
+              vectorequiv="MultiTexCoord4fvARB" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -5980,13 +6272,14 @@
         <param name="q" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord4fvARB" offset="403">
+    <function name="MultiTexCoord4fvARB" offset="403" exec="dynamic">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="211"/>
     </function>
 
-    <function name="MultiTexCoord4iARB" offset="404" vectorequiv="MultiTexCoord4ivARB">
+    <function name="MultiTexCoord4iARB"
+              vectorequiv="MultiTexCoord4iv" alias="MultiTexCoord4i">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
@@ -5994,13 +6287,13 @@
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord4ivARB" offset="405">
+    <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">
+    <function name="MultiTexCoord4sARB"
+              vectorequiv="MultiTexCoord4sv" alias="MultiTexCoord4s">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
@@ -6008,10 +6301,9 @@
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord4svARB" offset="407">
+    <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>
 
@@ -6023,24 +6315,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>
 
@@ -6073,10 +6361,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>
 
@@ -6133,7 +6420,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"/>
@@ -6141,35 +6428,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"/>
@@ -6179,12 +6463,11 @@
         <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="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"/>
@@ -6192,33 +6475,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>
 
@@ -6228,25 +6508,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"/>
@@ -6379,47 +6659,47 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="WeightbvARB">
+    <function name="WeightbvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLbyte *"/>
     </function>
 
-    <function name="WeightsvARB">
+    <function name="WeightsvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLshort *"/>
     </function>
 
-    <function name="WeightivARB">
+    <function name="WeightivARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLint *"/>
     </function>
 
-    <function name="WeightfvARB">
+    <function name="WeightfvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLfloat *"/>
     </function>
 
-    <function name="WeightdvARB">
+    <function name="WeightdvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLdouble *"/>
     </function>
 
-    <function name="WeightubvARB">
+    <function name="WeightubvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLubyte *"/>
     </function>
 
-    <function name="WeightusvARB">
+    <function name="WeightusvARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLushort *"/>
     </function>
 
-    <function name="WeightuivARB">
+    <function name="WeightuivARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="weights" type="const GLuint *"/>
     </function>
 
-    <function name="WeightPointerARB">
+    <function name="WeightPointerARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -6427,7 +6707,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexBlendARB">
+    <function name="VertexBlendARB" exec="skip">
         <param name="count" type="GLint"/>
     </function>
 </category>
@@ -6462,30 +6742,30 @@
     </enum>
     <enum name="MATRIX_INDEX_ARRAY_POINTER_ARB"           value="0x8849"/>
 
-    <function name="CurrentPaletteMatrixARB">
+    <function name="CurrentPaletteMatrixARB" exec="skip">
         <param name="index" type="GLint"/>
         <glx ignore="true" rop="4329"/>
     </function>
 
-    <function name="MatrixIndexubvARB">
+    <function name="MatrixIndexubvARB" exec="skip">
         <param name="size" type="GLint" counter="true"/>
         <param name="indices" type="const GLubyte *" count="size"/>
         <glx ignore="true" rop="4326"/>
     </function>
 
-    <function name="MatrixIndexusvARB">
+    <function name="MatrixIndexusvARB" exec="skip">
         <param name="size" type="GLint" counter="true"/>
         <param name="indices" type="const GLushort *" count="size"/>
         <glx ignore="true" rop="4327"/>
     </function>
 
-    <function name="MatrixIndexuivARB">
+    <function name="MatrixIndexuivARB" exec="skip">
         <param name="size" type="GLint" counter="true"/>
         <param name="indices" type="const GLuint *" count="size"/>
         <glx ignore="true" rop="4328"/>
     </function>
 
-    <function name="MatrixIndexPointerARB">
+    <function name="MatrixIndexPointerARB" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -6576,79 +6856,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>
@@ -6658,35 +6938,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"/>
@@ -6831,136 +7111,137 @@
     <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">
+    <function name="VertexAttrib1dARB"
+              vectorequiv="VertexAttrib1dv" alias="VertexAttrib1d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib1dvARB" offset="assign">
+    <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" vectorequiv="VertexAttrib1fvARB">
+    <function name="VertexAttrib1fARB" offset="assign"
+              vectorequiv="VertexAttrib1fvARB" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib1fvARB" offset="assign">
+    <function name="VertexAttrib1fvARB" offset="assign" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="4193"/>
     </function>
 
-    <function name="VertexAttrib1sARB" offset="assign" vectorequiv="VertexAttrib1svARB">
+    <function name="VertexAttrib1sARB"
+              vectorequiv="VertexAttrib1sv" alias="VertexAttrib1s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib1svARB" offset="assign">
+    <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">
+    <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">
+    <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" vectorequiv="VertexAttrib2fvARB">
+    <function name="VertexAttrib2fARB" offset="assign"
+              vectorequiv="VertexAttrib2fvARB" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib2fvARB" offset="assign">
+    <function name="VertexAttrib2fvARB" offset="assign" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="4194"/>
     </function>
 
-    <function name="VertexAttrib2sARB" offset="assign" vectorequiv="VertexAttrib2svARB">
+    <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">
+    <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">
+    <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">
+    <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" vectorequiv="VertexAttrib3fvARB">
+    <function name="VertexAttrib3fARB" offset="assign"
+              vectorequiv="VertexAttrib3fvARB" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib3fvARB" offset="assign">
+    <function name="VertexAttrib3fvARB" offset="assign" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="4195"/>
     </function>
 
-    <function name="VertexAttrib3sARB" offset="assign" vectorequiv="VertexAttrib3svARB">
+    <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">
+    <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">
+    <function name="VertexAttrib4dARB"
+              vectorequiv="VertexAttrib4dv" alias="VertexAttrib4d">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -6968,13 +7249,13 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib4dvARB" offset="assign">
+    <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" vectorequiv="VertexAttrib4fvARB">
+    <function name="VertexAttrib4fARB" offset="assign"
+              vectorequiv="VertexAttrib4fvARB" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -6982,13 +7263,14 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib4fvARB" offset="assign">
+    <function name="VertexAttrib4fvARB" offset="assign" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="4196"/>
     </function>
 
-    <function name="VertexAttrib4sARB" offset="assign" vectorequiv="VertexAttrib4svARB">
+    <function name="VertexAttrib4sARB"
+              vectorequiv="VertexAttrib4sv" alias="VertexAttrib4s">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
@@ -6996,13 +7278,13 @@
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib4svARB" offset="assign">
+    <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">
+    <function name="VertexAttrib4NubARB"
+              vectorequiv="VertexAttrib4Nubv" alias="VertexAttrib4Nub">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
@@ -7010,93 +7292,79 @@
         <param name="w" type="GLubyte"/>
     </function>
 
-    <function name="VertexAttrib4NubvARB" offset="assign">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <function name="ProgramStringARB" offset="assign" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="format" type="GLenum"/>
         <param name="len" type="GLsizei" counter="true"/>
@@ -7104,27 +7372,32 @@
         <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" vectorequiv="ProgramEnvParameter4dvARB">
+    <function name="ProgramEnvParameter4dARB" offset="assign"
+              vectorequiv="ProgramEnvParameter4dvARB" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
@@ -7133,14 +7406,16 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="ProgramEnvParameter4dvARB" offset="assign">
+    <function name="ProgramEnvParameter4dvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="const GLdouble *" count="4"/>
         <glx rop="4185" doubles_in_order="true"/>
     </function>
 
-    <function name="ProgramEnvParameter4fARB" offset="assign" vectorequiv="ProgramEnvParameter4fvARB">
+    <function name="ProgramEnvParameter4fARB" offset="assign"
+              vectorequiv="ProgramEnvParameter4fvARB" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
@@ -7149,14 +7424,16 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="ProgramEnvParameter4fvARB" offset="assign">
+    <function name="ProgramEnvParameter4fvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="const GLfloat *" count="4"/>
         <glx rop="4184"/>
     </function>
 
-    <function name="ProgramLocalParameter4dARB" offset="assign" vectorequiv="ProgramLocalParameter4dvARB">
+    <function name="ProgramLocalParameter4dARB" offset="assign"
+              vectorequiv="ProgramLocalParameter4dvARB" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
@@ -7165,14 +7442,16 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="ProgramLocalParameter4dvARB" offset="assign">
+    <function name="ProgramLocalParameter4dvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="const GLdouble *" count="4"/>
         <glx rop="4216" doubles_in_order="true"/>
     </function>
 
-    <function name="ProgramLocalParameter4fARB" offset="assign" vectorequiv="ProgramLocalParameter4fvARB">
+    <function name="ProgramLocalParameter4fARB" offset="assign"
+              vectorequiv="ProgramLocalParameter4fvARB" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
@@ -7181,7 +7460,8 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="ProgramLocalParameter4fvARB" offset="assign">
+    <function name="ProgramLocalParameter4fvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="const GLfloat *" count="4"/>
@@ -7200,28 +7480,32 @@
          the ARB_vertex_program protocol to unused padding.
       -->
 
-    <function name="GetProgramEnvParameterdvARB" offset="assign">
+    <function name="GetProgramEnvParameterdvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="GLdouble *" output="true" count="4"/>
         <glx vendorpriv="1297" handcode="client" doubles_in_order="true"/>
     </function>
 
-    <function name="GetProgramEnvParameterfvARB" offset="assign">
+    <function name="GetProgramEnvParameterfvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="GLfloat *" output="true" count="4"/>
         <glx vendorpriv="1296" handcode="client"/>
     </function>
 
-    <function name="GetProgramLocalParameterdvARB" offset="assign">
+    <function name="GetProgramLocalParameterdvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="GLdouble *" output="true" count="4"/>
         <glx vendorpriv="1306" handcode="client" doubles_in_order="true"/>
     </function>
 
-    <function name="GetProgramLocalParameterfvARB" offset="assign">
+    <function name="GetProgramLocalParameterfvARB" offset="assign"
+              deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="params" type="GLfloat *" output="true" count="4"/>
@@ -7229,21 +7513,21 @@
     </function>
 
 
-    <function name="GetProgramivARB" offset="assign">
+    <function name="GetProgramivARB" offset="assign" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx vendorpriv="1307"/>
     </function>
 
-    <function name="GetProgramStringARB" offset="assign">
+    <function name="GetProgramStringARB" offset="assign" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="string" type="GLvoid *" output="true"/>
         <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"/>
@@ -7300,10 +7584,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"/>
@@ -7339,18 +7623,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"/>
@@ -7366,147 +7650,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="data" type="const GLvoid *" count="size"/>
         <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>
 
@@ -7564,17 +7829,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">
@@ -7588,159 +7851,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">
@@ -7773,44 +8014,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>
 
@@ -7823,29 +8059,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>
 
@@ -7927,7 +8160,9 @@
 
 <!-- ARB extension number 55 is a GLX extension. -->
 <!-- ARB extension number 56 is a WGL extension. -->
-<!-- 57. GL_ARB_uniform_buffer_object -->
+
+<xi:include href="ARB_uniform_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- 58. GL_ARB_compatibility -->
 
 <xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -7945,15 +8180,16 @@
 
 <xi:include href="ARB_sync.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- 67. GL_ARB_texture_multisample -->
+<xi:include href="ARB_texture_multisample.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- 68. GL_ARB_vertex_array_bgra -->
 
 <xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="AMD_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- 70. GL_ARB_sample_shading -->
-<!-- 71. GL_ARB_texture_cube_map_array -->
-<!-- 72. GL_ARB_texture_gather -->
+<xi:include href="ARB_sample_shading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_texture_gather.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <!-- 73. GL_ARB_texture_query_lod -->
 
 <!-- ARB extension number 74 is a WGL extension. -->
@@ -7979,24 +8215,163 @@
 <xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- 84. GL_ARB_texture_swizzle -->
-<!-- 85. GL_ARB_timer_query -->
+
+<category name="GL_ARB_timer_query" number="85">
+    <enum name="TIME_ELAPSED" value="0x88BF"/>
+    <enum name="TIMESTAMP" value="0x8E28"/>
+    <type name="int64"                  size="8"/>
+    <type name="uint64" unsigned="true" size="8"/>
+    <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" static_dispatch="false" offset="assign">
+        <param name="id" type="GLuint"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLuint64 *"/>
+    </function>
+    <function name="QueryCounter" offset="assign" static_dispatch="false">
+        <param name="id" type="GLuint"/>
+        <param name="target" type="GLenum"/>
+    </function>
+</category>
 
 <xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- ARB extensions #86...#94 -->
+<!-- ARB extensions #86...#93 -->
+
+<xi:include href="ARB_draw_indirect.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_gpu_shader5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<category name="GL_ARB_transform_feedback3" number="94">
+  <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/>
+  <enum name="MAX_VERTEX_STREAMS"             value="0x8E71"/>
+
+  <function name="DrawTransformFeedbackStream" offset="assign"
+            exec="dynamic">
+    <param name="mode" type="GLenum"/>
+    <param name="id" type="GLuint"/>
+    <param name="stream" type="GLuint"/>
+  </function>
+
+  <function name="BeginQueryIndexed" offset="assign">
+    <param name="target" type="GLenum"/>
+    <param name="index" type="GLuint"/>
+    <param name="id" type="GLuint"/>
+  </function>
+
+  <function name="EndQueryIndexed" offset="assign">
+    <param name="target" type="GLenum"/>
+    <param name="index" type="GLuint"/>
+  </function>
+
+  <function name="GetQueryIndexediv" offset="assign">
+    <param name="target" type="GLenum"/>
+    <param name="index" type="GLuint"/>
+    <param name="pname" type="GLenum"/>
+    <param name="params" type="GLint *"/>
+  </function>
+</category>
+
+<!-- ARB extensions #95...#96 -->
+
+<xi:include href="ARB_separate_shader_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #98...#108 -->
 
 <xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- ARB extensions #96...#103 -->
+<xi:include href="ARB_get_program_binary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-<!-- ARB extensions #106...#116 -->
+<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<category name="GL_ARB_transform_feedback_instanced" number="109">
+  <function name="DrawTransformFeedbackInstanced" offset="assign"
+            exec="dynamic">
+    <param name="mode" type="GLenum"/>
+    <param name="id" type="GLuint"/>
+    <param name="primcount" type="GLsizei"/>
+  </function>
+
+  <function name="DrawTransformFeedbackStreamInstanced" offset="assign"
+            exec="dynamic">
+    <param name="mode" type="GLenum"/>
+    <param name="id" type="GLuint"/>
+    <param name="stream" type="GLuint"/>
+    <param name="primcount" type="GLsizei"/>
+  </function>
+</category>
+
+<!-- ARB extensions #110...#116 -->
+
+<xi:include href="ARB_internalformat_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<category name="GL_ARB_map_buffer_alignment" number="113">
+  <enum name="MIN_MAP_BUFFER_ALIGNMENT" value="0x90BC" />
+</category>
+
+<xi:include href="ARB_shader_atomic_counters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_shader_image_load_store.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<!-- ARB extension #118 -->
+
+<xi:include href="KHR_debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension #120 -->
+
+<xi:include href="ARB_clear_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_compute_shader.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension #123 -->
+
+<xi:include href="ARB_texture_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_vertex_attrib_binding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension #126 -->
+
+<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #128...#131 -->
+
+<xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #134...#138 -->
+
+<xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- 140. GL_ARB_texture_query_levels -->
+
+<xi:include href="ARB_texture_storage_multisample.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension 142 - 143. -->
+
+<category name="GL_ARB_buffer_storage" number="144">
+    <enum name="MAP_PERSISTENT_BIT" value="0x40" />
+    <enum name="MAP_COHERENT_BIT" value="0x80" />
+    <enum name="DYNAMIC_STORAGE_BIT" value="0x100" />
+    <enum name="CLIENT_STORAGE_BIT" value="0x200" />
+    <enum name="BUFFER_IMMUTABLE_STORAGE" value="0x821F" />
+    <enum name="BUFFER_STORAGE_FLAGS" value="0x8220" />
+    <enum name="CLIENT_MAPPED_BUFFER_BARRIER_BIT" value="0x4000" />
+
+    <function name="BufferStorage" offset="assign">
+        <param name="target" type="GLenum"/>
+        <param name="size" type="GLsizeiptr"/>
+        <param name="data" type="const GLvoid *"/>
+        <param name="flags" type="GLbitfield"/>
+    </function>
+</category>
 
 <!-- Non-ARB extensions sorted by extension number. -->
 
@@ -8018,7 +8393,9 @@
 </category>
 
 <category name="GL_EXT_polygon_offset" number="3">
-    <function name="PolygonOffsetEXT" offset="assign">
+    <enum name="POLYGON_OFFSET_BIAS_EXT"                  value="0x8039"/>
+
+    <function name="PolygonOffsetEXT" offset="assign" deprecated="3.1">
         <param name="factor" type="GLfloat"/>
         <param name="bias" type="GLfloat"/>
         <glx rop="4098" ignore="true"/>
@@ -8122,14 +8499,14 @@
 </category>
 
 <category name="GL_SGIS_texture_filter4" number="7">
-    <function name="GetTexFilterFuncSGIS">
+    <function name="GetTexFilterFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="filter" type="GLenum"/>
         <param name="weights" type="GLfloat *" output="true"/>
         <glx vendorpriv="4101" ignore="true"/>
     </function>
 
-    <function name="TexFilterFuncSGIS">
+    <function name="TexFilterFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="filter" type="GLenum"/>
         <param name="n" type="GLsizei" counter="true"/>
@@ -8619,37 +8996,37 @@
 </category>
 
 <category name="GL_SGIS_pixel_texture" number="15">
-    <function name="PixelTexGenParameteriSGIS">
+    <function name="PixelTexGenParameteriSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterivSGIS">
+    <function name="PixelTexGenParameterivSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterfSGIS">
+    <function name="PixelTexGenParameterfSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterfvSGIS">
+    <function name="PixelTexGenParameterfvSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetPixelTexGenParameterivSGIS">
+    <function name="GetPixelTexGenParameterivSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetPixelTexGenParameterfvSGIS">
+    <function name="GetPixelTexGenParameterfvSGIS" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
@@ -8657,7 +9034,7 @@
 </category>
 
 <category name="GL_SGIS_texture4D" number="16">
-    <function name="TexImage4DSGIS">
+    <function name="TexImage4DSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -8672,7 +9049,7 @@
         <glx rop="2057" ignore="true"/>
     </function>
 
-    <function name="TexSubImage4DSGIS">
+    <function name="TexSubImage4DSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -8738,14 +9115,14 @@
 </category>
 
 <category name="GL_SGIS_detail_texture" number="21">
-    <function name="DetailTexFuncSGIS">
+    <function name="DetailTexFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="points" type="const GLfloat *" count="n"/>
         <glx rop="2051" ignore="true"/>
     </function>
 
-    <function name="GetDetailTexFuncSGIS">
+    <function name="GetDetailTexFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="points" type="GLfloat *" output="true"/>
         <glx vendorpriv="4096" ignore="true"/>
@@ -8753,14 +9130,14 @@
 </category>
 
 <category name="GL_SGIS_sharpen_texture" number="22">
-    <function name="SharpenTexFuncSGIS">
+    <function name="SharpenTexFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="points" type="const GLfloat *" count="n" count_scale="2"/>
         <glx rop="2052" ignore="true"/>
     </function>
 
-    <function name="GetSharpenTexFuncSGIS">
+    <function name="GetSharpenTexFuncSGIS" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="points" type="GLfloat *" output="true"/>
         <glx vendorpriv="4097" ignore="true"/>
@@ -8768,13 +9145,15 @@
 </category>
 
 <category name="GL_SGIS_multisample" number="25">
-    <function name="SampleMaskSGIS" offset="assign" static_dispatch="false">
+    <function name="SampleMaskSGIS" offset="assign" static_dispatch="false"
+              exec="skip">
         <param name="value" type="GLclampf"/>
         <param name="invert" type="GLboolean"/>
         <glx rop="2048"/>
     </function>
 
-    <function name="SamplePatternSGIS" offset="assign" static_dispatch="false">
+    <function name="SamplePatternSGIS" offset="assign" static_dispatch="false"
+              exec="skip">
         <param name="pattern" type="GLenum"/>
         <glx rop="2049"/>
     </function>
@@ -8805,7 +9184,7 @@
         <param name="i" type="GLint"/>
     </function>
 
-    <function name="ColorPointerEXT" offset="assign">
+    <function name="ColorPointerEXT" offset="assign" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -8820,7 +9199,7 @@
         <param name="count" type="GLsizei"/>
     </function>
 
-    <function name="EdgeFlagPointerEXT" offset="assign">
+    <function name="EdgeFlagPointerEXT" offset="assign" deprecated="3.1">
         <param name="stride" type="GLsizei"/>
         <param name="count" type="GLsizei"/>
         <param name="pointer" type="const GLboolean *"/>
@@ -8832,7 +9211,7 @@
         <param name="params" type="GLvoid **" output="true"/>
     </function>
 
-    <function name="IndexPointerEXT" offset="assign">
+    <function name="IndexPointerEXT" offset="assign" deprecated="3.1">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="count" type="GLsizei"/>
@@ -8840,7 +9219,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="NormalPointerEXT" offset="assign">
+    <function name="NormalPointerEXT" offset="assign" deprecated="3.1">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="count" type="GLsizei"/>
@@ -8848,7 +9227,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="TexCoordPointerEXT" offset="assign">
+    <function name="TexCoordPointerEXT" offset="assign" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -8857,7 +9236,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexPointerEXT" offset="assign">
+    <function name="VertexPointerEXT" offset="assign" deprecated="3.1">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -8971,25 +9350,25 @@
 <!-- Extension number 50 is a GLX extension. -->
 
 <category name="GL_SGIX_sprite" number="52">
-    <function name="SpriteParameterfSGIX">
+    <function name="SpriteParameterfSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="SpriteParameterfvSGIX">
+    <function name="SpriteParameterfvSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="SpriteParameteriSGIX">
+    <function name="SpriteParameteriSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="SpriteParameterivSGIX">
+    <function name="SpriteParameterivSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
@@ -8998,59 +9377,57 @@
 
 <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">
+    <function name="PointParameterfEXT" alias="PointParameterf">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
-        <glx rop="2065"/>
     </function>
 
-    <function name="PointParameterfvEXT" offset="assign">
+    <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>
 
 <category name="GL_SGIX_instruments" number="55">
-    <function name="GetInstrumentsSGIX">
+    <function name="GetInstrumentsSGIX" exec="skip">
         <return type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="InstrumentsBufferSGIX">
+    <function name="InstrumentsBufferSGIX" exec="skip">
         <param name="size" type="GLsizei"/>
         <param name="buffer" type="GLint *" output="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PollInstrumentsSGIX">
+    <function name="PollInstrumentsSGIX" exec="skip">
         <param name="marker_p" type="GLint *" output="true"/>
         <return type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ReadInstrumentsSGIX">
+    <function name="ReadInstrumentsSGIX" exec="skip">
         <param name="marker" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="StartInstrumentsSGIX">
+    <function name="StartInstrumentsSGIX" exec="skip">
         <glx ignore="true"/>
     </function>
 
-    <function name="StopInstrumentsSGIX">
+    <function name="StopInstrumentsSGIX" exec="skip">
         <param name="marker" type="GLint"/>
         <glx ignore="true"/>
     </function>
@@ -9074,14 +9451,14 @@
 </category>
 
 <category name="GL_SGIX_framezoom" number="57">
-    <function name="FrameZoomSGIX">
+    <function name="FrameZoomSGIX" exec="skip">
         <param name="factor" type="GLint"/>
         <glx rop="2072" ignore="true"/>
     </function>
 </category>
 
 <category name="GL_SGIX_tag_sample_buffer" number="58">
-    <function name="TagSampleBufferSGIX">
+    <function name="TagSampleBufferSGIX" exec="skip">
         <glx rop="2050" ignore="true"/>
     </function>
 </category>
@@ -9089,14 +9466,14 @@
 <!-- Extension number 59 is not listed in the extension registry. -->
 
 <category name="GL_SGIX_reference_plane" number="60">
-    <function name="ReferencePlaneSGIX">
+    <function name="ReferencePlaneSGIX" exec="skip">
         <param name="equation" type="const GLdouble *" count="4"/>
         <glx rop="2071" ignore="true"/>
     </function>
 </category>
 
 <category name="GL_SGIX_flush_raster" number="61">
-    <function name="FlushRasterSGIX">
+    <function name="FlushRasterSGIX" exec="skip">
         <glx vendorpriv="4105" ignore="true"/>
     </function>
 </category>
@@ -9110,13 +9487,13 @@
 </category>
 
 <category name="GL_SGIS_fog_function" number="64">
-    <function name="FogFuncSGIS">
+    <function name="FogFuncSGIS" exec="skip">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="points" type="const GLfloat *" count="n" count_scale="2"/>
         <glx rop="2067" ignore="true"/>
     </function>
 
-    <function name="GetFogFuncSGIS">
+    <function name="GetFogFuncSGIS" exec="skip">
         <param name="points" type="GLfloat *" output="true"/>
         <!-- GLX protocol for this function is unknown. -->
     </function>
@@ -9131,37 +9508,37 @@
 </category>
 
 <category name="GL_HP_image_transform" number="66">
-    <function name="ImageTransformParameteriHP">
+    <function name="ImageTransformParameteriHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
-    <function name="ImageTransformParameterfHP">
+    <function name="ImageTransformParameterfHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="ImageTransformParameterivHP">
+    <function name="ImageTransformParameterivHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="ImageTransformParameterfvHP">
+    <function name="ImageTransformParameterfvHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
     </function>
 
-    <function name="GetImageTransformParameterivHP">
+    <function name="GetImageTransformParameterivHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetImageTransformParameterfvHP">
+    <function name="GetImageTransformParameterfvHP" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
@@ -9208,7 +9585,7 @@
 <!-- Extension number 75 is a GLU extension. -->
 
 <category name="GL_PGI_misc_hints" number="77">
-    <function name="HintPGI">
+    <function name="HintPGI" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="mode" type="GLint"/>
         <glx ignore="true"/>
@@ -9292,42 +9669,42 @@
 </category>
 
 <category name="GL_SGIX_list_priority" number="80">
-    <function name="GetListParameterfvSGIX">
+    <function name="GetListParameterfvSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetListParameterivSGIX">
+    <function name="GetListParameterivSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ListParameterfSGIX">
+    <function name="ListParameterfSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ListParameterfvSGIX">
+    <function name="ListParameterfvSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ListParameteriSGIX">
+    <function name="ListParameteriSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ListParameterivSGIX">
+    <function name="ListParameterivSGIX" exec="skip">
         <param name="list" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
@@ -9379,7 +9756,7 @@
 <!-- Extension number 92 is a GLX extension. -->
 
 <category name="GL_EXT_index_material" number="94">
-    <function name="IndexMaterialEXT">
+    <function name="IndexMaterialEXT" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="mode" type="GLenum"/>
         <glx ignore="true"/>
@@ -9387,7 +9764,7 @@
 </category>
 
 <category name="GL_EXT_index_func" number="95">
-    <function name="IndexFuncEXT">
+    <function name="IndexFuncEXT" exec="skip">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampf"/>
         <glx ignore="true"/>
@@ -9398,13 +9775,13 @@
     <enum name="ARRAY_ELEMENT_LOCK_FIRST_EXT"             value="0x81A8"/>
     <enum name="ARRAY_ELEMENT_LOCK_COUNT_EXT"             value="0x81A9"/>
 
-    <function name="LockArraysEXT" offset="assign">
+    <function name="LockArraysEXT" offset="assign" deprecated="3.1">
         <param name="first" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <glx handcode="true" ignore="true"/>
     </function>
 
-    <function name="UnlockArraysEXT" offset="assign">
+    <function name="UnlockArraysEXT" offset="assign" deprecated="3.1">
         <glx handcode="true" ignore="true"/>
     </function>
 </category>
@@ -9420,13 +9797,13 @@
         <size name="CullParameterdv"/>
     </enum>
 
-    <function name="CullParameterdvEXT">
+    <function name="CullParameterdvEXT" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLdouble *"/> <!-- Spec bug. Should be const. -->
         <glx ignore="true"/>
     </function>
 
-    <function name="CullParameterfvEXT">
+    <function name="CullParameterfvEXT" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *"/> <!-- Spec bug. Should be const. -->
         <glx ignore="true"/>
@@ -9434,125 +9811,125 @@
 </category>
 
 <!-- Extension number 99 is not listed in the extension registry. -->
-<!-- Extension number 100 is a GLU extension. -->
+<xi:include href="ARB_viewport_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- Shouldn't this be EXT_fragment_lighting? -->
 <category name="GL_SGIX_fragment_lighting" number="102">
-    <function name="FragmentColorMaterialSGIX">
+    <function name="FragmentColorMaterialSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="mode" type="GLenum"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightfSGIX">
+    <function name="FragmentLightfSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightfvSGIX">
+    <function name="FragmentLightfvSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightiSGIX">
+    <function name="FragmentLightiSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightivSGIX">
+    <function name="FragmentLightivSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightModelfSGIX">
+    <function name="FragmentLightModelfSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightModelfvSGIX">
+    <function name="FragmentLightModelfvSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightModeliSGIX">
+    <function name="FragmentLightModeliSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentLightModelivSGIX">
+    <function name="FragmentLightModelivSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentMaterialfSGIX">
+    <function name="FragmentMaterialfSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentMaterialfvSGIX">
+    <function name="FragmentMaterialfvSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentMaterialiSGIX">
+    <function name="FragmentMaterialiSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FragmentMaterialivSGIX">
+    <function name="FragmentMaterialivSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFragmentLightfvSGIX">
+    <function name="GetFragmentLightfvSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFragmentLightivSGIX">
+    <function name="GetFragmentLightivSGIX" exec="skip">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFragmentMaterialfvSGIX">
+    <function name="GetFragmentMaterialfvSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFragmentMaterialivSGIX">
+    <function name="GetFragmentMaterialivSGIX" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="LightEnviSGIX">
+    <function name="LightEnviSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
@@ -9589,15 +9966,15 @@
 <!-- Extension number 116 is not listed in the extension registry. -->
 
 <category name="GL_EXT_light_texture" number="117">
-    <function name="ApplyTextureEXT">
+    <function name="ApplyTextureEXT" exec="skip">
         <param name="mode" type="GLenum"/>
     </function>
 
-    <function name="TextureLightEXT">
+    <function name="TextureLightEXT" exec="skip">
         <param name="pname" type="GLenum"/>
     </function>
 
-    <function name="TextureMaterialEXT">
+    <function name="TextureMaterialEXT" exec="skip">
         <param name="face" type="GLenum"/>
         <param name="mode" type="GLenum"/>
     </function>
@@ -9615,55 +9992,55 @@
 <!-- Extension number 131 is not listed in the extension registry. -->
 
 <category name="GL_SGIX_async" number="132">
-    <function name="AsyncMarkerSGIX">
+    <function name="AsyncMarkerSGIX" exec="skip">
         <param name="marker" type="GLuint"/>
     </function>
 
-    <function name="FinishAsyncSGIX">
+    <function name="FinishAsyncSGIX" exec="skip">
         <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. -->
         <return type="GLint"/>
     </function>
 
-    <function name="PollAsyncSGIX">
+    <function name="PollAsyncSGIX" exec="skip">
         <param name="markerp" type="GLuint *"/> <!-- Spec bug. Should be const. -->
         <return type="GLint"/>
     </function>
 
-    <function name="GenAsyncMarkersSGIX">
+    <function name="GenAsyncMarkersSGIX" exec="skip">
         <param name="range" type="GLsizei"/>
         <return type="GLuint"/>
     </function>
 
-    <function name="DeleteAsyncMarkersSGIX">
+    <function name="DeleteAsyncMarkersSGIX" exec="skip">
         <param name="marker" type="GLuint"/>
         <param name="range" type="GLsizei"/>
     </function>
 
-    <function name="IsAsyncMarkerSGIX">
+    <function name="IsAsyncMarkerSGIX" exec="skip">
         <param name="marker" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
 </category>
 
 <category name="GL_INTEL_parallel_arrays" number="136">
-    <function name="VertexPointervINTEL">
+    <function name="VertexPointervINTEL" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="pointer" type="const GLvoid **"/>
     </function>
 
-    <function name="NormalPointervINTEL">
+    <function name="NormalPointervINTEL" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="pointer" type="const GLvoid **"/>
     </function>
 
-    <function name="ColorPointervINTEL">
+    <function name="ColorPointervINTEL" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="pointer" type="const GLvoid **"/>
     </function>
 
-    <function name="TexCoordPointervINTEL">
+    <function name="TexCoordPointervINTEL" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="pointer" type="const GLvoid **"/>
@@ -9680,25 +10057,25 @@
 </category>
 
 <category name="GL_EXT_pixel_transform" number="138">
-    <function name="PixelTransformParameteriEXT">
+    <function name="PixelTransformParameteriEXT" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
-    <function name="PixelTransformParameterfEXT">
+    <function name="PixelTransformParameterfEXT" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="PixelTransformParameterivEXT">
+    <function name="PixelTransformParameterivEXT" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="PixelTransformParameterfvEXT">
+    <function name="PixelTransformParameterfvEXT" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
@@ -9724,26 +10101,26 @@
 </category>
 
 <category name="GL_EXT_secondary_color" number="145">
-    <function name="SecondaryColor3bEXT" offset="assign" vectorequiv="SecondaryColor3bvEXT">
+    <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">
-        <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">
+    <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">
-        <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">
@@ -9757,119 +10134,117 @@
         <glx rop="4129"/>
     </function>
 
-    <function name="SecondaryColor3iEXT" offset="assign" vectorequiv="SecondaryColor3ivEXT">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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">
+    <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">
-        <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>
 
 <category name="GL_EXT_texture_perturb_normal" number="147">
-    <function name="TextureNormalEXT">
+    <function name="TextureNormalEXT" exec="skip">
         <param name="mode" type="GLenum"/>
     </function>
 </category>
 
 <category name="GL_EXT_multi_draw_arrays" number="148">
-    <function name="MultiDrawArraysEXT" offset="assign">
+    <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">
+    <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0"
+              exec="dynamic">
         <param name="mode" type="GLenum"/>
         <param name="count" type="const GLsizei *"/>
         <param name="type" type="GLenum"/>
-        <param name="indices" type="const GLvoid **"/>
+        <param name="indices" type="const GLvoid * const *"/>
         <param name="primcount" type="GLsizei"/>
         <glx handcode="true"/>
     </function>
 </category>
 
 <category name="GL_EXT_fog_coord" number="149">
-    <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT">
+    <function name="FogCoordfEXT" offset="assign" vectorequiv="FogCoordfvEXT"
+              exec="dynamic">
         <param name="coord" type="GLfloat"/>
     </function>
 
-    <function name="FogCoordfvEXT" offset="assign">
+    <function name="FogCoordfvEXT" offset="assign" exec="dynamic">
         <param name="coord" type="const GLfloat *" count="1"/>
         <glx rop="4124"/>
     </function>
 
-    <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT">
+    <function name="FogCoorddEXT" vectorequiv="FogCoorddv" alias="FogCoordd">
         <param name="coord" type="GLdouble"/>
     </function>
 
-    <function name="FogCoorddvEXT" offset="assign">
-        <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>
 
@@ -9880,113 +10255,113 @@
 <!-- Extension number 154 is not listed in the extension registry. -->
 
 <category name="GL_EXT_coordinate_frame" number="156">
-    <function name="Tangent3bEXT">
+    <function name="Tangent3bEXT" exec="skip">
         <param name="tx" type="GLbyte"/>
         <param name="ty" type="GLbyte"/>
         <param name="tz" type="GLbyte"/>
     </function>
 
-    <function name="Tangent3bvEXT">
+    <function name="Tangent3bvEXT" exec="skip">
         <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="Tangent3dEXT">
+    <function name="Tangent3dEXT" exec="skip">
         <param name="tx" type="GLdouble"/>
         <param name="ty" type="GLdouble"/>
         <param name="tz" type="GLdouble"/>
     </function>
 
-    <function name="Tangent3dvEXT">
+    <function name="Tangent3dvEXT" exec="skip">
         <param name="v" type="const GLdouble *"/>
     </function>
 
-    <function name="Tangent3fEXT">
+    <function name="Tangent3fEXT" exec="skip">
         <param name="tx" type="GLfloat"/>
         <param name="ty" type="GLfloat"/>
         <param name="tz" type="GLfloat"/>
     </function>
 
-    <function name="Tangent3fvEXT">
+    <function name="Tangent3fvEXT" exec="skip">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Tangent3iEXT">
+    <function name="Tangent3iEXT" exec="skip">
         <param name="tx" type="GLint"/>
         <param name="ty" type="GLint"/>
         <param name="tz" type="GLint"/>
     </function>
 
-    <function name="Tangent3ivEXT">
+    <function name="Tangent3ivEXT" exec="skip">
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="Tangent3sEXT">
+    <function name="Tangent3sEXT" exec="skip">
         <param name="tx" type="GLshort"/>
         <param name="ty" type="GLshort"/>
         <param name="tz" type="GLshort"/>
     </function>
 
-    <function name="Tangent3svEXT">
+    <function name="Tangent3svEXT" exec="skip">
         <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="Binormal3bEXT">
+    <function name="Binormal3bEXT" exec="skip">
         <param name="bx" type="GLbyte"/>
         <param name="by" type="GLbyte"/>
         <param name="bz" type="GLbyte"/>
     </function>
 
-    <function name="Binormal3bvEXT">
+    <function name="Binormal3bvEXT" exec="skip">
         <param name="v" type="const GLbyte *"/>
     </function>
 
-    <function name="Binormal3dEXT">
+    <function name="Binormal3dEXT" exec="skip">
         <param name="bx" type="GLdouble"/>
         <param name="by" type="GLdouble"/>
         <param name="bz" type="GLdouble"/>
     </function>
 
-    <function name="Binormal3dvEXT">
+    <function name="Binormal3dvEXT" exec="skip">
         <param name="v" type="const GLdouble *"/>
     </function>
 
-    <function name="Binormal3fEXT">
+    <function name="Binormal3fEXT" exec="skip">
         <param name="bx" type="GLfloat"/>
         <param name="by" type="GLfloat"/>
         <param name="bz" type="GLfloat"/>
     </function>
 
-    <function name="Binormal3fvEXT">
+    <function name="Binormal3fvEXT" exec="skip">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Binormal3iEXT">
+    <function name="Binormal3iEXT" exec="skip">
         <param name="bx" type="GLint"/>
         <param name="by" type="GLint"/>
         <param name="bz" type="GLint"/>
     </function>
 
-    <function name="Binormal3ivEXT">
+    <function name="Binormal3ivEXT" exec="skip">
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="Binormal3sEXT">
+    <function name="Binormal3sEXT" exec="skip">
         <param name="bx" type="GLshort"/>
         <param name="by" type="GLshort"/>
         <param name="bz" type="GLshort"/>
     </function>
 
-    <function name="Binormal3svEXT">
+    <function name="Binormal3svEXT" exec="skip">
         <param name="v" type="const GLshort *"/>
     </function>
 
-    <function name="TangentPointerEXT">
+    <function name="TangentPointerEXT" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
     </function>
 
-    <function name="BinormalPointerEXT">
+    <function name="BinormalPointerEXT" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
@@ -10020,7 +10395,7 @@
 </category>
 
 <category name="GL_SGIX_pixel_texture" number="160">
-    <function name="PixelTexGenSGIX" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenSGIX" exec="skip">
         <param name="mode" type="GLenum"/>
         <glx rop="2059" ignore="true"/>
     </function>
@@ -10030,70 +10405,70 @@
 <!-- Extension number 162 is not listed in the extension registry. -->
 
 <category name="GL_SUNX_constant_data" number="163">
-    <function name="FinishTextureSUNX">
+    <function name="FinishTextureSUNX" exec="skip">
     </function>
 </category>
 
 <category name="GL_SUN_global_alpha" number="164">
-    <function name="GlobalAlphaFactorbSUN">
+    <function name="GlobalAlphaFactorbSUN" exec="skip">
         <param name="factor" type="GLbyte"/>
     </function>
 
-    <function name="GlobalAlphaFactorsSUN">
+    <function name="GlobalAlphaFactorsSUN" exec="skip">
         <param name="factor" type="GLshort"/>
     </function>
 
-    <function name="GlobalAlphaFactoriSUN">
+    <function name="GlobalAlphaFactoriSUN" exec="skip">
         <param name="factor" type="GLint"/>
     </function>
 
-    <function name="GlobalAlphaFactorfSUN">
+    <function name="GlobalAlphaFactorfSUN" exec="skip">
         <param name="factor" type="GLfloat"/>
     </function>
 
-    <function name="GlobalAlphaFactordSUN">
+    <function name="GlobalAlphaFactordSUN" exec="skip">
         <param name="factor" type="GLdouble"/>
     </function>
 
-    <function name="GlobalAlphaFactorubSUN">
+    <function name="GlobalAlphaFactorubSUN" exec="skip">
         <param name="factor" type="GLubyte"/>
     </function>
 
-    <function name="GlobalAlphaFactorusSUN">
+    <function name="GlobalAlphaFactorusSUN" exec="skip">
         <param name="factor" type="GLushort"/>
     </function>
 
-    <function name="GlobalAlphaFactoruiSUN">
+    <function name="GlobalAlphaFactoruiSUN" exec="skip">
         <param name="factor" type="GLuint"/>
     </function>
 </category>
 
 <category name="GL_SUN_triangle_list" number="165">
-    <function name="ReplacementCodeuiSUN">
+    <function name="ReplacementCodeuiSUN" exec="skip">
         <param name="code" type="GLuint"/>
     </function>
 
-    <function name="ReplacementCodeusSUN">
+    <function name="ReplacementCodeusSUN" exec="skip">
         <param name="code" type="GLushort"/>
     </function>
 
-    <function name="ReplacementCodeubSUN">
+    <function name="ReplacementCodeubSUN" exec="skip">
         <param name="code" type="GLubyte"/>
     </function>
 
-    <function name="ReplacementCodeuivSUN">
+    <function name="ReplacementCodeuivSUN" exec="skip">
         <param name="code" type="const GLuint *"/>
     </function>
 
-    <function name="ReplacementCodeusvSUN">
+    <function name="ReplacementCodeusvSUN" exec="skip">
         <param name="code" type="const GLushort *"/>
     </function>
 
-    <function name="ReplacementCodeubvSUN">
+    <function name="ReplacementCodeubvSUN" exec="skip">
         <param name="code" type="const GLubyte *"/>
     </function>
 
-    <function name="ReplacementCodePointerSUN">
+    <function name="ReplacementCodePointerSUN" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
@@ -10101,7 +10476,7 @@
 </category>
 
 <category name="GL_SUN_vertex" number="166">
-    <function name="Color4ubVertex2fSUN">
+    <function name="Color4ubVertex2fSUN" exec="skip">
         <param name="r" type="GLubyte"/>
         <param name="g" type="GLubyte"/>
         <param name="b" type="GLubyte"/>
@@ -10110,12 +10485,12 @@
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="Color4ubVertex2fvSUN">
+    <function name="Color4ubVertex2fvSUN" exec="skip">
         <param name="c" type="const GLubyte *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Color4ubVertex3fSUN">
+    <function name="Color4ubVertex3fSUN" exec="skip">
         <param name="r" type="GLubyte"/>
         <param name="g" type="GLubyte"/>
         <param name="b" type="GLubyte"/>
@@ -10125,12 +10500,12 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Color4ubVertex3fvSUN">
+    <function name="Color4ubVertex3fvSUN" exec="skip">
         <param name="c" type="const GLubyte *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Color3fVertex3fSUN">
+    <function name="Color3fVertex3fSUN" exec="skip">
         <param name="r" type="GLfloat"/>
         <param name="g" type="GLfloat"/>
         <param name="b" type="GLfloat"/>
@@ -10139,12 +10514,12 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Color3fVertex3fvSUN">
+    <function name="Color3fVertex3fvSUN" exec="skip">
         <param name="c" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Normal3fVertex3fSUN">
+    <function name="Normal3fVertex3fSUN" exec="skip">
         <param name="nx" type="GLfloat"/>
         <param name="ny" type="GLfloat"/>
         <param name="nz" type="GLfloat"/>
@@ -10153,12 +10528,12 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Normal3fVertex3fvSUN">
+    <function name="Normal3fVertex3fvSUN" exec="skip">
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="Color4fNormal3fVertex3fSUN">
+    <function name="Color4fNormal3fVertex3fSUN" exec="skip">
         <param name="r" type="GLfloat"/>
         <param name="g" type="GLfloat"/>
         <param name="b" type="GLfloat"/>
@@ -10171,13 +10546,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Color4fNormal3fVertex3fvSUN">
+    <function name="Color4fNormal3fVertex3fvSUN" exec="skip">
         <param name="c" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord2fVertex3fSUN">
+    <function name="TexCoord2fVertex3fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="x" type="GLfloat"/>
@@ -10185,12 +10560,12 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fVertex3fvSUN">
+    <function name="TexCoord2fVertex3fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord4fVertex4fSUN">
+    <function name="TexCoord4fVertex4fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="p" type="GLfloat"/>
@@ -10201,12 +10576,12 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord4fVertex4fvSUN">
+    <function name="TexCoord4fVertex4fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord2fColor4ubVertex3fSUN">
+    <function name="TexCoord2fColor4ubVertex3fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLubyte"/>
@@ -10218,13 +10593,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fColor4ubVertex3fvSUN">
+    <function name="TexCoord2fColor4ubVertex3fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="c" type="const GLubyte *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord2fColor3fVertex3fSUN">
+    <function name="TexCoord2fColor3fVertex3fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
@@ -10235,13 +10610,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fColor3fVertex3fvSUN">
+    <function name="TexCoord2fColor3fVertex3fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="c" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord2fNormal3fVertex3fSUN">
+    <function name="TexCoord2fNormal3fVertex3fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="nx" type="GLfloat"/>
@@ -10252,13 +10627,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fNormal3fVertex3fvSUN">
+    <function name="TexCoord2fNormal3fVertex3fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord2fColor4fNormal3fVertex3fSUN">
+    <function name="TexCoord2fColor4fNormal3fVertex3fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
@@ -10273,14 +10648,14 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fColor4fNormal3fVertex3fvSUN">
+    <function name="TexCoord2fColor4fNormal3fVertex3fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="c" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="TexCoord4fColor4fNormal3fVertex4fSUN">
+    <function name="TexCoord4fColor4fNormal3fVertex4fSUN" exec="skip">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="p" type="GLfloat"/>
@@ -10298,26 +10673,26 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord4fColor4fNormal3fVertex4fvSUN">
+    <function name="TexCoord4fColor4fNormal3fVertex4fvSUN" exec="skip">
         <param name="tc" type="const GLfloat *"/>
         <param name="c" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiVertex3fSUN">
+    <function name="ReplacementCodeuiVertex3fSUN" exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiVertex3fvSUN">
+    <function name="ReplacementCodeuiVertex3fvSUN" exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiColor4ubVertex3fSUN">
+    <function name="ReplacementCodeuiColor4ubVertex3fSUN" exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="r" type="GLubyte"/>
         <param name="g" type="GLubyte"/>
@@ -10328,13 +10703,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiColor4ubVertex3fvSUN">
+    <function name="ReplacementCodeuiColor4ubVertex3fvSUN" exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="c" type="const GLubyte *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiColor3fVertex3fSUN">
+    <function name="ReplacementCodeuiColor3fVertex3fSUN" exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="r" type="GLfloat"/>
         <param name="g" type="GLfloat"/>
@@ -10344,13 +10719,13 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiColor3fVertex3fvSUN">
+    <function name="ReplacementCodeuiColor3fVertex3fvSUN" exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="c" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiNormal3fVertex3fSUN">
+    <function name="ReplacementCodeuiNormal3fVertex3fSUN" exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="nx" type="GLfloat"/>
         <param name="ny" type="GLfloat"/>
@@ -10360,13 +10735,14 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiNormal3fVertex3fvSUN">
+    <function name="ReplacementCodeuiNormal3fVertex3fvSUN" exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN">
+    <function name="ReplacementCodeuiColor4fNormal3fVertex3fSUN"
+              exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="r" type="GLfloat"/>
         <param name="g" type="GLfloat"/>
@@ -10380,14 +10756,15 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN">
+    <function name="ReplacementCodeuiColor4fNormal3fVertex3fvSUN"
+              exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="c" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fVertex3fSUN">
+    <function name="ReplacementCodeuiTexCoord2fVertex3fSUN" exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -10396,13 +10773,14 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN">
+    <function name="ReplacementCodeuiTexCoord2fVertex3fvSUN" exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="tc" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN">
+    <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN"
+              exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -10414,14 +10792,16 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN">
+    <function name="ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN"
+              exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="tc" type="const GLfloat *"/>
         <param name="n" type="const GLfloat *"/>
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN">
+    <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN"
+              exec="skip">
         <param name="rc" type="GLuint"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -10437,7 +10817,8 @@
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN">
+    <function name="ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN"
+              exec="skip">
         <param name="rc" type="const GLuint *"/>
         <param name="tc" type="const GLfloat *"/>
         <param name="c" type="const GLfloat *"/>
@@ -10454,12 +10835,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>
 
@@ -10510,17 +10890,18 @@
 </category>
 
 <category name="GL_EXT_vertex_weighting" number="188">
-    <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT">
+    <function name="VertexWeightfEXT" vectorequiv="VertexWeightfvEXT"
+              exec="skip">
         <param name="weight" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="VertexWeightfvEXT">
+    <function name="VertexWeightfvEXT" exec="skip">
         <param name="weight" type="const GLfloat *" count="1"/>
         <glx rop="4135" ignore="true"/>
     </function>
 
-    <function name="VertexWeightPointerEXT">
+    <function name="VertexWeightPointerEXT" exec="skip">
         <param name="size" type="GLsizei"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -10539,11 +10920,11 @@
 </category>
 
 <category name="GL_NV_vertex_array_range" number="190">
-    <function name="FlushVertexArrayRangeNV" offset="assign">
+    <function name="FlushVertexArrayRangeNV" exec="skip">
         <glx ignore="true"/>
     </function>
 
-    <function name="VertexArrayRangeNV" offset="assign">
+    <function name="VertexArrayRangeNV" exec="skip">
         <param name="length" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
         <glx ignore="true"/>
@@ -10551,31 +10932,31 @@
 </category>
 
 <category name="GL_NV_register_combiners" number="191">
-    <function name="CombinerParameterfvNV" offset="assign">
+    <function name="CombinerParameterfvNV" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="4137" ignore="true"/>
     </function>
 
-    <function name="CombinerParameterfNV" offset="assign">
+    <function name="CombinerParameterfNV" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="4136" ignore="true"/>
     </function>
 
-    <function name="CombinerParameterivNV" offset="assign">
+    <function name="CombinerParameterivNV" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
         <glx rop="4139" ignore="true"/>
     </function>
 
-    <function name="CombinerParameteriNV" offset="assign">
+    <function name="CombinerParameteriNV" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="4138" ignore="true"/>
     </function>
 
-    <function name="CombinerInputNV" offset="assign">
+    <function name="CombinerInputNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="variable" type="GLenum"/>
@@ -10585,7 +10966,7 @@
         <glx rop="4140" ignore="true"/>
     </function>
 
-    <function name="CombinerOutputNV" offset="assign">
+    <function name="CombinerOutputNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="abOutput" type="GLenum"/>
@@ -10599,7 +10980,7 @@
         <glx rop="4141" ignore="true"/>
     </function>
 
-    <function name="FinalCombinerInputNV" offset="assign">
+    <function name="FinalCombinerInputNV" exec="skip">
         <param name="variable" type="GLenum"/>
         <param name="input" type="GLenum"/>
         <param name="mapping" type="GLenum"/>
@@ -10607,7 +10988,7 @@
         <glx rop="4142" ignore="true"/>
     </function>
 
-    <function name="GetCombinerInputParameterfvNV" offset="assign">
+    <function name="GetCombinerInputParameterfvNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="variable" type="GLenum"/>
@@ -10616,7 +10997,7 @@
         <glx vendorpriv="1270" ignore="true"/>
     </function>
 
-    <function name="GetCombinerInputParameterivNV" offset="assign">
+    <function name="GetCombinerInputParameterivNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="variable" type="GLenum"/>
@@ -10625,7 +11006,7 @@
         <glx vendorpriv="1271" ignore="true"/>
     </function>
 
-    <function name="GetCombinerOutputParameterfvNV" offset="assign">
+    <function name="GetCombinerOutputParameterfvNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="pname" type="GLenum"/>
@@ -10633,7 +11014,7 @@
         <glx vendorpriv="1272" ignore="true"/>
     </function>
 
-    <function name="GetCombinerOutputParameterivNV" offset="assign">
+    <function name="GetCombinerOutputParameterivNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="portion" type="GLenum"/>
         <param name="pname" type="GLenum"/>
@@ -10641,14 +11022,14 @@
         <glx vendorpriv="1273" ignore="true"/>
     </function>
 
-    <function name="GetFinalCombinerInputParameterfvNV" offset="assign">
+    <function name="GetFinalCombinerInputParameterfvNV" exec="skip">
         <param name="variable" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true"/>
         <glx vendorpriv="1274" ignore="true"/>
     </function>
 
-    <function name="GetFinalCombinerInputParameterivNV" offset="assign">
+    <function name="GetFinalCombinerInputParameterivNV" exec="skip">
         <param name="variable" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
@@ -10699,104 +11080,89 @@
 </category>
 
 <category name="GL_MESA_resize_buffers" number="196">
-    <function name="ResizeBuffersMESA" offset="assign">
+    <function name="ResizeBuffersMESA" offset="assign" exec="skip">
         <glx ignore="true"/>
     </function>
 </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">
+    <function name="WindowPos4dMESA" offset="assign" deprecated="3.1">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
@@ -10804,12 +11170,12 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4dvMESA" offset="assign">
+    <function name="WindowPos4dvMESA" offset="assign" deprecated="3.1">
         <param name="v" type="const GLdouble *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4fMESA" offset="assign">
+    <function name="WindowPos4fMESA" offset="assign" deprecated="3.1">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
@@ -10817,12 +11183,12 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4fvMESA" offset="assign">
+    <function name="WindowPos4fvMESA" offset="assign" deprecated="3.1">
         <param name="v" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4iMESA" offset="assign">
+    <function name="WindowPos4iMESA" offset="assign" deprecated="3.1">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
@@ -10830,12 +11196,12 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4ivMESA" offset="assign">
+    <function name="WindowPos4ivMESA" offset="assign" deprecated="3.1">
         <param name="v" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4sMESA" offset="assign">
+    <function name="WindowPos4sMESA" offset="assign" deprecated="3.1">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
@@ -10843,7 +11209,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="WindowPos4svMESA" offset="assign">
+    <function name="WindowPos4svMESA" offset="assign" deprecated="3.1">
         <param name="v" type="const GLshort *"/>
         <glx ignore="true"/>
     </function>
@@ -10878,7 +11244,7 @@
 </category>
 
 <category name="GL_IBM_vertex_array_lists" number="201">
-    <function name="ColorPointerListIBM">
+    <function name="ColorPointerListIBM" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
@@ -10886,7 +11252,7 @@
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="SecondaryColorPointerListIBM">
+    <function name="SecondaryColorPointerListIBM" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
@@ -10894,34 +11260,34 @@
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="EdgeFlagPointerListIBM">
+    <function name="EdgeFlagPointerListIBM" exec="skip">
         <param name="stride" type="GLint"/>
         <param name="pointer" type="const GLboolean **"/>
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="FogCoordPointerListIBM">
+    <function name="FogCoordPointerListIBM" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
         <param name="pointer" type="const GLvoid **"/>
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="IndexPointerListIBM">
+    <function name="IndexPointerListIBM" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
         <param name="pointer" type="const GLvoid **"/>
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="NormalPointerListIBM">
+    <function name="NormalPointerListIBM" exec="skip">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
         <param name="pointer" type="const GLvoid **"/>
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="TexCoordPointerListIBM">
+    <function name="TexCoordPointerListIBM" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
@@ -10929,7 +11295,7 @@
         <param name="ptrstride" type="GLint"/>
     </function>
 
-    <function name="VertexPointerListIBM">
+    <function name="VertexPointerListIBM" exec="skip">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLint"/>
@@ -10956,7 +11322,7 @@
 </category>
 
 <category name="GL_3DFX_tbuffer" number="208">
-    <function name="TbufferMask3DFX">
+    <function name="TbufferMask3DFX" exec="skip">
         <param name="mask" type="GLuint"/>
         <glx ignore="true"/>
     </function>
@@ -10979,7 +11345,7 @@
 <category name="GL_SGIS_texture_color_mask" number="214">
     <enum name="TEXTURE_COLOR_WRITEMASK_SGIS"             value="0x81EF"/>
 
-    <function name="TextureColorMaskSGIS">
+    <function name="TextureColorMaskSGIS" exec="skip">
         <param name="red" type="GLboolean"/>
         <param name="green" type="GLboolean"/>
         <param name="blue" type="GLboolean"/>
@@ -11005,43 +11371,43 @@
 </category>
 
 <category name="GL_NV_fence" number="222">
-    <function name="DeleteFencesNV" offset="assign" static_dispatch="false">
+    <function name="DeleteFencesNV" exec="skip">
         <param name="n" type="GLsizei"/>
         <param name="fences" type="const GLuint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GenFencesNV" offset="assign" static_dispatch="false">
+    <function name="GenFencesNV" exec="skip">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="fences" type="GLuint *" output="true" count="n"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="IsFenceNV" offset="assign" static_dispatch="false">
+    <function name="IsFenceNV" exec="skip">
         <param name="fence" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="TestFenceNV" offset="assign" static_dispatch="false">
+    <function name="TestFenceNV" exec="skip">
         <param name="fence" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFenceivNV" offset="assign" static_dispatch="false">
+    <function name="GetFenceivNV" exec="skip">
         <param name="fence" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FinishFenceNV" offset="assign" static_dispatch="false">
+    <function name="FinishFenceNV" exec="skip">
         <param name="fence" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="SetFenceNV" offset="assign" static_dispatch="false">
+    <function name="SetFenceNV" exec="skip">
         <param name="fence" type="GLuint"/>
         <param name="condition" type="GLenum"/>
         <glx ignore="true"/>
@@ -11053,7 +11419,7 @@
 </category>
 
 <category name="GL_NV_evaluators" number="225">
-    <function name="MapControlPointsNV">
+    <function name="MapControlPointsNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
@@ -11065,19 +11431,19 @@
         <param name="points" type="const GLvoid *"/>
     </function>
 
-    <function name="MapParameterivNV">
+    <function name="MapParameterivNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="MapParameterfvNV">
+    <function name="MapParameterfvNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
     </function>
 
-    <function name="GetMapControlPointsNV">
+    <function name="GetMapControlPointsNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
@@ -11087,33 +11453,33 @@
         <param name="points" type="GLvoid *" output="true"/>
     </function>
 
-    <function name="GetMapParameterivNV">
+    <function name="GetMapParameterivNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="GetMapParameterfvNV">
+    <function name="GetMapParameterfvNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true"/>
     </function>
 
-    <function name="GetMapAttribParameterivNV">
+    <function name="GetMapAttribParameterivNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="GetMapAttribParameterfvNV">
+    <function name="GetMapAttribParameterfvNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true"/>
     </function>
 
-    <function name="EvalMapsNV">
+    <function name="EvalMapsNV" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="mode" type="GLenum"/>
     </function>
@@ -11125,13 +11491,13 @@
 </category>
 
 <category name="GL_NV_register_combiners2" number="227">
-    <function name="CombinerStageParameterfvNV">
+    <function name="CombinerStageParameterfvNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
     </function>
 
-    <function name="GetCombinerStageParameterfvNV">
+    <function name="GetCombinerStageParameterfvNV" exec="skip">
         <param name="stage" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true"/>
@@ -11265,7 +11631,8 @@
     <enum name="MAP2_VERTEX_ATTRIB14_4_NV"                value="0x867E"/>
     <enum name="MAP2_VERTEX_ATTRIB15_4_NV"                value="0x867F"/>
 
-    <function name="AreProgramsResidentNV" offset="assign">
+    <function name="AreProgramsResidentNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="ids" type="const GLuint *" count="n"/>
         <param name="residences" type="GLboolean *" output="true" count="n"/>
@@ -11273,29 +11640,27 @@
         <glx vendorpriv="1293"/>
     </function>
 
-    <function name="BindProgramNV" offset="assign">
+    <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">
-        <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">
+    <function name="ExecuteProgramNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="id" type="GLuint"/>
         <param name="params" type="const GLfloat *" count="4"/>
         <glx rop="4181"/>
     </function>
 
-    <function name="GenProgramsNV" 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 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
@@ -11304,7 +11669,8 @@
          of these functions.
       -->
 
-    <function name="GetProgramParameterdvNV" offset="assign">
+    <function name="GetProgramParameterdvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
@@ -11312,7 +11678,8 @@
         <glx vendorpriv="1297"/>
     </function>
 
-    <function name="GetProgramParameterfvNV" offset="assign">
+    <function name="GetProgramParameterfvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
@@ -11320,21 +11687,24 @@
         <glx vendorpriv="1296"/>
     </function>
 
-    <function name="GetProgramivNV" offset="assign">
+    <function name="GetProgramivNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx vendorpriv="1298"/>
     </function>
 
-    <function name="GetProgramStringNV" offset="assign">
+    <function name="GetProgramStringNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="program" type="GLubyte *" output="true"/>
         <glx vendorpriv="1299" handcode="server" always_array="true"/>
     </function>
 
-    <function name="GetTrackMatrixivNV" offset="assign">
+    <function name="GetTrackMatrixivNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="address" type="GLuint"/>
         <param name="pname" type="GLenum"/>
@@ -11342,41 +11712,43 @@
         <glx vendorpriv="1300"/>
     </function>
 
-    <function name="GetVertexAttribdvNV" offset="assign">
+    <function name="GetVertexAttribdvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLdouble *" output="true" variable_param="pname"/>
         <glx vendorpriv="1301"/>
     </function>
 
-    <function name="GetVertexAttribfvNV" offset="assign">
+    <function name="GetVertexAttribfvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx vendorpriv="1302"/>
     </function>
 
-    <function name="GetVertexAttribivNV" offset="assign">
+    <function name="GetVertexAttribivNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx vendorpriv="1303"/>
     </function>
 
-    <function name="GetVertexAttribPointervNV" offset="assign">
+    <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">
+    <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">
+    <function name="LoadProgramNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
@@ -11414,7 +11786,8 @@
         <param name="params" type="const GLfloat *"/>
     </function>
 
-    <function name="ProgramParameters4dvNV" offset="assign">
+    <function name="ProgramParameters4dvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="num" type="GLsizei" counter="true"/>
@@ -11422,7 +11795,8 @@
         <glx rop="4187"/>
     </function>
 
-    <function name="ProgramParameters4fvNV" offset="assign">
+    <function name="ProgramParameters4fvNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="num" type="GLsizei" counter="true"/>
@@ -11430,13 +11804,15 @@
         <glx rop="4186"/>
     </function>
 
-    <function name="RequestResidentProgramsNV" offset="assign">
+    <function name="RequestResidentProgramsNV" offset="assign"
+              deprecated="3.1" exec="skip">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="ids" type="const GLuint *" count="n"/>
         <glx rop="4182"/>
     </function>
 
-    <function name="TrackMatrixNV" offset="assign">
+    <function name="TrackMatrixNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="target" type="GLenum"/>
         <param name="address" type="GLuint"/>
         <param name="matrix" type="GLenum"/>
@@ -11444,7 +11820,8 @@
         <glx rop="4188"/>
     </function>
 
-    <function name="VertexAttribPointerNV" offset="assign">
+    <function name="VertexAttribPointerNV" offset="assign" deprecated="3.1"
+              exec="skip">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
@@ -11453,43 +11830,47 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexAttrib1sNV" offset="assign" vectorequiv="VertexAttrib1svNV">
+    <function name="VertexAttrib1sNV" offset="assign"
+              vectorequiv="VertexAttrib1svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib1svNV" offset="assign">
+    <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">
+    <function name="VertexAttrib2sNV" offset="assign"
+              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">
+    <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">
+    <function name="VertexAttrib3sNV" offset="assign"
+              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">
+    <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">
+    <function name="VertexAttrib4sNV" offset="assign"
+              vectorequiv="VertexAttrib4svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
@@ -11497,49 +11878,60 @@
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib4svNV" offset="assign">
+    <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="4268"/>
     </function>
 
-    <function name="VertexAttrib1fNV" offset="assign" vectorequiv="VertexAttrib1fvNV">
+    <function name="VertexAttrib1fNV" offset="assign"
+              vectorequiv="VertexAttrib1fvNV" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib1fvNV" offset="assign">
+    <function name="VertexAttrib1fvNV" offset="assign" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="4269"/>
     </function>
 
-    <function name="VertexAttrib2fNV" offset="assign" vectorequiv="VertexAttrib2fvNV">
+    <function name="VertexAttrib2fNV" offset="assign"
+              vectorequiv="VertexAttrib2fvNV" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib2fvNV" offset="assign">
+    <function name="VertexAttrib2fvNV" offset="assign" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="4270"/>
     </function>
 
-    <function name="VertexAttrib3fNV" offset="assign" vectorequiv="VertexAttrib3fvNV">
+    <function name="VertexAttrib3fNV" offset="assign"
+              vectorequiv="VertexAttrib3fvNV" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib3fvNV" offset="assign">
+    <function name="VertexAttrib3fvNV" offset="assign" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="4271"/>
     </function>
 
-    <function name="VertexAttrib4fNV" offset="assign" vectorequiv="VertexAttrib4fvNV">
+    <function name="VertexAttrib4fNV" offset="assign"
+              vectorequiv="VertexAttrib4fvNV" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -11547,49 +11939,54 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib4fvNV" offset="assign">
+    <function name="VertexAttrib4fvNV" offset="assign" deprecated="3.1"
+              exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="4272"/>
     </function>
 
-    <function name="VertexAttrib1dNV" offset="assign" vectorequiv="VertexAttrib1dvNV">
+    <function name="VertexAttrib1dNV" offset="assign"
+              vectorequiv="VertexAttrib1dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib1dvNV" offset="assign">
+    <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">
+    <function name="VertexAttrib2dNV" offset="assign"
+              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">
+    <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">
+    <function name="VertexAttrib3dNV" offset="assign"
+              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">
+    <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">
+    <function name="VertexAttrib4dNV" offset="assign"
+              vectorequiv="VertexAttrib4dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -11597,13 +11994,14 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib4dvNV" offset="assign">
+    <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">
+    <function name="VertexAttrib4ubNV" offset="assign"
+              vectorequiv="VertexAttrib4ubvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
@@ -11611,97 +12009,97 @@
         <param name="w" type="GLubyte"/>
     </function>
 
-    <function name="VertexAttrib4ubvNV" offset="assign">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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">
+    <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"/>
@@ -11770,22 +12168,22 @@
         <size name="GetTexEnviv" mode="get"/>
         <size name="GetTexEnvfv" mode="get"/>
     </enum>
-    <function name="TexBumpParameterfvATI" offset="assign">
+    <function name="TexBumpParameterfvATI" offset="assign" deprecated="3.1">
       <param name="pname" type="GLenum"/>
       <param name="param" type="const GLfloat *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="TexBumpParameterivATI" offset="assign">
+    <function name="TexBumpParameterivATI" offset="assign" deprecated="3.1">
       <param name="pname" type="GLenum"/>
       <param name="param" type="const GLint *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="GetTexBumpParameterfvATI" offset="assign">
+    <function name="GetTexBumpParameterfvATI" offset="assign" deprecated="3.1">
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLfloat *" variable_param="pname"/>
       <glx ignore="true"/>
     </function>
-    <function name="GetTexBumpParameterivATI" offset="assign">
+    <function name="GetTexBumpParameterivATI" offset="assign" deprecated="3.1">
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLint *" variable_param="pname"/>
       <glx ignore="true"/>
@@ -11904,45 +12302,45 @@
     redudndant garbage.  There are a lot of enums with the value 0x00000001.
     -->
 
-    <function name="GenFragmentShadersATI" offset="assign">
+    <function name="GenFragmentShadersATI" offset="assign" deprecated="3.1">
       <return type="GLuint"/>
       <param name="range" type="GLuint"/>
       <glx ignore="true"/>
     </function>
     
-    <function name="BindFragmentShaderATI" offset="assign">
+    <function name="BindFragmentShaderATI" offset="assign" deprecated="3.1">
       <param name="id" type="GLuint"/>
       <glx ignore="true"/>
     </function>
 
-    <function name="DeleteFragmentShaderATI" offset="assign">
+    <function name="DeleteFragmentShaderATI" offset="assign" deprecated="3.1">
       <param name="id" type="GLuint"/>
       <glx ignore="true"/>
     </function>
 
-    <function name="BeginFragmentShaderATI" offset="assign">
+    <function name="BeginFragmentShaderATI" offset="assign" deprecated="3.1">
       <glx ignore="true"/>
     </function>
 
-    <function name="EndFragmentShaderATI" offset="assign">
+    <function name="EndFragmentShaderATI" offset="assign" deprecated="3.1">
       <glx ignore="true"/>
     </function>
     
-    <function name="PassTexCoordATI" offset="assign">
+    <function name="PassTexCoordATI" offset="assign" deprecated="3.1">
       <param name="dst" type="GLuint"/>
       <param name="coord" type="GLuint"/>
       <param name="swizzle" type="GLenum"/>
       <glx ignore="true"/>
     </function>
 
-    <function name="SampleMapATI" offset="assign">
+    <function name="SampleMapATI" offset="assign" deprecated="3.1">
       <param name="dst" type="GLuint"/>
       <param name="interp" type="GLuint"/>
       <param name="swizzle" type="GLenum"/>
       <glx ignore="true"/>
     </function>
 
-    <function name="ColorFragmentOp1ATI" offset="assign">
+    <function name="ColorFragmentOp1ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMask" type="GLuint"/>
@@ -11953,7 +12351,7 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="ColorFragmentOp2ATI" offset="assign">
+    <function name="ColorFragmentOp2ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMask" type="GLuint"/>
@@ -11967,7 +12365,7 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="ColorFragmentOp3ATI" offset="assign">
+    <function name="ColorFragmentOp3ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMask" type="GLuint"/>
@@ -11984,7 +12382,7 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="AlphaFragmentOp1ATI" offset="assign">
+    <function name="AlphaFragmentOp1ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMod" type="GLuint"/>
@@ -11994,7 +12392,7 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="AlphaFragmentOp2ATI" offset="assign">
+    <function name="AlphaFragmentOp2ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMod" type="GLuint"/>
@@ -12007,7 +12405,7 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="AlphaFragmentOp3ATI" offset="assign">
+    <function name="AlphaFragmentOp3ATI" offset="assign" deprecated="3.1">
       <param name="op" type="GLenum"/>
       <param name="dst" type="GLuint"/>
       <param name="dstMod" type="GLuint"/>
@@ -12023,7 +12421,8 @@
       <glx ignore="true"/>
     </function>
 
-    <function name="SetFragmentShaderConstantATI" offset="assign">
+    <function name="SetFragmentShaderConstantATI" offset="assign"
+              deprecated="3.1">
       <param name="dst" type="GLuint"/>
       <param name="value" type="const GLfloat *"/>
       <glx ignore="true"/>
@@ -12041,7 +12440,7 @@
     <enum name="QUAD_MESH_SUN"                            value="0x8614"/>
     <enum name="TRIANGLE_MESH_SUN"                        value="0x8615"/>
 
-    <function name="DrawMeshArraysSUN">
+    <function name="DrawMeshArraysSUN" exec="skip">
         <param name="mode" type="GLenum"/>
         <param name="first" type="GLint"/>
         <param name="count" type="GLsizei"/>
@@ -12070,16 +12469,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">
@@ -12092,21 +12491,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">
+    <function name="PointParameteriNV" alias="PointParameteri">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
-        <glx rop="4221"/>
     </function>
 
-    <function name="PointParameterivNV" offset="assign">
+    <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>
 
@@ -12125,7 +12522,8 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="ActiveStencilFaceEXT" offset="assign" static_dispatch="false">
+    <function name="ActiveStencilFaceEXT" offset="assign"
+              static_dispatch="false" deprecated="3.1">
         <param name="face" type="GLenum"/>
         <glx rop="4220"/>
     </function>
@@ -12165,7 +12563,9 @@
     <enum name="MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV" value="0x8868"/>
     <enum name="PROGRAM_ERROR_STRING_NV"                  value="0x8874"/>
 
-    <function name="ProgramNamedParameter4fNV" offset="assign" vectorequiv="ProgramNamedParameter4fvNV">
+    <function name="ProgramNamedParameter4fNV" offset="assign"
+              vectorequiv="ProgramNamedParameter4fvNV" deprecated="3.1"
+              exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12175,7 +12575,9 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="ProgramNamedParameter4dNV" offset="assign" vectorequiv="ProgramNamedParameter4dvNV">
+    <function name="ProgramNamedParameter4dNV" offset="assign"
+              vectorequiv="ProgramNamedParameter4dvNV" deprecated="3.1"
+              exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12185,7 +12587,8 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="ProgramNamedParameter4fvNV" offset="assign">
+    <function name="ProgramNamedParameter4fvNV" offset="assign"
+              deprecated="3.1" exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12193,7 +12596,8 @@
         <glx rop="4218"/>
     </function>
 
-    <function name="ProgramNamedParameter4dvNV" offset="assign">
+    <function name="ProgramNamedParameter4dvNV" offset="assign"
+              deprecated="3.1" exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12201,7 +12605,8 @@
         <glx rop="4219"/>
     </function>
 
-    <function name="GetProgramNamedParameterfvNV" offset="assign">
+    <function name="GetProgramNamedParameterfvNV" offset="assign"
+              deprecated="3.1" exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12209,7 +12614,8 @@
         <glx vendorpriv="1310" always_array="true"/>
     </function>
 
-    <function name="GetProgramNamedParameterdvNV" offset="assign">
+    <function name="GetProgramNamedParameterdvNV" offset="assign"
+              deprecated="3.1" exec="skip">
         <param name="id" type="GLuint"/>
         <param name="len" type="GLsizei" counter="true"/>
         <param name="name" type="const GLubyte *" count="len"/>
@@ -12274,10 +12680,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>
 
@@ -12359,12 +12764,14 @@
     <enum name="BUFFER_FLUSHING_UNMAP_APPLE" count="1" value="0x8A13">
         <size name="GetBufferParameteriv" mode="get"/>
     </enum>
-    <function name="BufferParameteriAPPLE" offset="assign" static_dispatch="false">
+    <function name="BufferParameteriAPPLE" offset="assign"
+              static_dispatch="false" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
-    <function name="FlushMappedBufferRangeAPPLE" offset="assign" static_dispatch="false">
+    <function name="FlushMappedBufferRangeAPPLE" offset="assign"
+              static_dispatch="false" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="size" type="GLsizeiptr"/>
@@ -12384,6 +12791,8 @@
     <enum name="FRAMEBUFFER_SRGB_CAPABLE_EXT"      value="0x8DBA"/>
 </category>
 
+<xi:include href="AMD_performance_monitor.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <category name="GL_APPLE_texture_range" number="367">
     <enum name="TEXTURE_STORAGE_HINT_APPLE" count="1" value="0x85BC">
         <size name="TexParameteriv"/>
@@ -12410,12 +12819,12 @@
     <enum name="TEXTURE_RANGE_POINTER_APPLE" count="1" value="0x85B8">
         <size name="GetTexParameterPointervAPPLE" mode="get"/>
     </enum>
-    <function name="TextureRangeAPPLE" offset="assign" static_dispatch="false">
+    <function name="TextureRangeAPPLE" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="length" type="GLsizei"/>
         <param name="pointer" type="GLvoid *"/>
     </function>
-    <function name="GetTexParameterPointervAPPLE" offset="assign" static_dispatch="false">
+    <function name="GetTexParameterPointervAPPLE" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **"/>
@@ -12434,7 +12843,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>
@@ -12460,7 +12869,8 @@
         <param name="zfail" type="GLenum"/>
         <param name="zpass" type="GLenum"/>
     </function>
-    <function name="StencilFuncSeparateATI" offset="assign" static_dispatch="false">
+    <function name="StencilFuncSeparateATI" offset="assign"
+              static_dispatch="false" deprecated="3.1">
         <param name="frontfunc" type="GLenum"/>
         <param name="backfunc" type="GLenum"/>
         <param name="ref" type="GLint"/>
@@ -12470,14 +12880,16 @@
 </category>
 
 <category name="GL_EXT_gpu_program_parameters">
-    <function name="ProgramEnvParameters4fvEXT" offset="assign" static_dispatch="false">
+    <function name="ProgramEnvParameters4fvEXT" offset="assign"
+              static_dispatch="false" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="params" type="const GLfloat *"/>
     </function>
 
-    <function name="ProgramLocalParameters4fvEXT" offset="assign" static_dispatch="false">
+    <function name="ProgramLocalParameters4fvEXT" offset="assign"
+              static_dispatch="false" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="index" type="GLuint"/>
         <param name="count" type="GLsizei"/>
@@ -12489,12 +12901,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 *"/>
@@ -12502,7 +12914,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"/>
@@ -12516,72 +12928,40 @@
     <enum name="RGBA8_SNORM"                              value="0x8F97"/>
 </category>
 
-<category name="GL_MESA_shader_debug">
-    <enum name="DEBUG_OBJECT_MESA"                        value="0x8759"/>
-    <enum name="DEBUG_PRINT_MESA"                         value="0x875A"/>
-    <enum name="DEBUG_ASSERT_MESA"                        value="0x875B"/>
-    <function name="CreateDebugObjectMESA">
-        <return type="GLhandleARB"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="ClearDebugLogMESA">
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="GetDebugLogMESA">
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <param name="maxLength" type="GLsizei"/>
-        <param name="length" type="GLsizei *" output="true"/>
-        <param name="debugLog" type="GLcharARB *" output="true"/>
-        <glx ignore="true"/>
-    </function>
-    <function name="GetDebugLogLengthMESA">
-        <return type="GLsizei"/>
-        <param name="obj" type="GLhandleARB"/>
-        <param name="logType" type="GLenum"/>
-        <param name="shaderType" type="GLenum"/>
-        <glx ignore="true"/>
-    </function>
-</category>
-
 <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>
 </category>
 
 <category name="GL_SGIX_igloo_interface">
-    <function name="IglooInterfaceSGIX">
+    <function name="IglooInterfaceSGIX" exec="skip">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLvoid *"/>
     </function>
 </category>
 
 <category name="GL_SGIX_polynomial_ffd">
-    <function name="DeformationMap3dSGIX">
+    <function name="DeformationMap3dSGIX" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLdouble"/>
         <param name="u2" type="GLdouble"/>
@@ -12598,7 +12978,7 @@
         <param name="points" type="const GLdouble *"/>
     </function>
 
-    <function name="DeformationMap3fSGIX">
+    <function name="DeformationMap3fSGIX" exec="skip">
         <param name="target" type="GLenum"/>
         <param name="u1" type="GLfloat"/>
         <param name="u2" type="GLfloat"/>
@@ -12615,11 +12995,11 @@
         <param name="points" type="const GLfloat *"/>
     </function>
 
-    <function name="DeformSGIX">
+    <function name="DeformSGIX" exec="skip">
         <param name="mask" type="GLenum"/>
     </function>
 
-    <function name="LoadIdentityDeformationMapSGIX">
+    <function name="LoadIdentityDeformationMapSGIX" exec="skip">
         <param name="mask" type="GLenum"/>
     </function>
 </category>
@@ -12638,4 +13018,9 @@
 <xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="NV_vdpau_interop.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </OpenGLAPI>