From 81a7f5078130c66855c56afc6c9803c89bf05ee8 Mon Sep 17 00:00:00 2001
From: Paul Berry <stereotype441@gmail.com>
Date: Wed, 10 Oct 2012 16:28:42 -0700
Subject: [PATCH] glapi: Add es1 and es2 attributes to XML.

Currently, the set of functions which exist in GLES1 or GLES2 is
determined by hardcoded lists of function names in gles_api.py.  This
patch encodes that information into the XML files using new
attributes, es1 and es2.

The es1 attribute denotes the first version of GLES 1 in which the
function exists (e.g. es1="1.1" means the function exists in GLES 1.1
but not GLES 1.0).  "none" (the default) means the function is not
available in any version of GLES 1.

The es2 attribute denotes the first version of GLES 2/3 in which the
function exists (e.g. es2="2.0" means the function exists in both GLES
2.0 and GLES 3.0).  "none" (the default) means the function is not
available in any version of GLES 2 or GLES 3.

Note that since GLES 3 is a strict superset of GLES 2, there is no
need for a separate attribute for it; instead, 'es2="3.0"' should be
used to denote functions that are present in GLES 3 but not GLES 2.

This patch only adds information about GLES versions 1.0, 1.1, and
2.0.

Later patches will modify the python code generation scripts to use
this information rather than the hardcoded lists in gles_api.py.

Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mapi/glapi/gen/ARB_ES2_compatibility.xml  |  10 +-
 src/mapi/glapi/gen/ARB_framebuffer_object.xml |  38 +-
 src/mapi/glapi/gen/OES_EGL_image.xml          |   6 +-
 src/mapi/glapi/gen/OES_fixed_point.xml        | 125 ++++---
 src/mapi/glapi/gen/OES_single_precision.xml   |  18 +-
 src/mapi/glapi/gen/es_EXT.xml                 | 159 +++++---
 src/mapi/glapi/gen/gl_API.dtd                 |   4 +-
 src/mapi/glapi/gen/gl_API.xml                 | 349 +++++++++---------
 src/mapi/glapi/gen/gl_and_es_API.xml          | 127 ++++---
 9 files changed, 502 insertions(+), 334 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_ES2_compatibility.xml b/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
index d52a88c6036..d157366122b 100644
--- a/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
+++ b/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
@@ -18,17 +18,17 @@
     <enum name="MAX_VARYING_VECTORS"                          value="0x8DFC"/>
     <enum name="MAX_FRAGMENT_UNIFORM_VECTORS"                 value="0x8DFD"/>
 
-    <function name="GetShaderPrecisionFormat" offset="assign">
+    <function name="GetShaderPrecisionFormat" offset="assign" es2="2.0">
         <param name="shadertype" type="GLenum"/>
         <param name="precisiontype" type="GLenum"/>
         <param name="range" type="GLint *"/>
         <param name="precision" type="GLint *"/>
     </function>
 
-    <function name="ReleaseShaderCompiler" offset="assign">
+    <function name="ReleaseShaderCompiler" offset="assign" es2="2.0">
     </function>
 
-    <function name="ShaderBinary" offset="assign">
+    <function name="ShaderBinary" offset="assign" es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="shaders" type="const GLuint *"/>
         <param name="binaryformat" type="GLenum"/>
@@ -45,11 +45,11 @@
     <enum name="IMPLEMENTATION_COLOR_READ_FORMAT"         value="0x8B9B"/>
 
     <!-- from GL_OES_single_precision -->
-    <function name="ClearDepthf" offset="assign">
+    <function name="ClearDepthf" offset="assign" es1="1.0" es2="2.0">
         <param name="depth" type="GLclampf"/>
     </function>
 
-    <function name="DepthRangef" offset="assign">
+    <function name="DepthRangef" offset="assign" es1="1.0" es2="2.0">
         <param name="zNear" type="GLclampf"/>
         <param name="zFar" type="GLclampf"/>
     </function>
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index e6bdcd6e509..7777fdbd6f8 100644
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -140,27 +140,29 @@
 
 
 
-    <function name="IsRenderbuffer" alias="IsRenderbufferEXT">
+    <function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0">
         <param name="renderbuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="BindRenderbuffer" alias="BindRenderbufferEXT">
+    <function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
-    <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT">
+    <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT"
+              es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="GenRenderbuffers" alias="GenRenderbuffersEXT">
+    <function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="RenderbufferStorage" alias="RenderbufferStorageEXT">
+    <function name="RenderbufferStorage" alias="RenderbufferStorageEXT"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -176,33 +178,36 @@
         <glx rop="4331"/>
     </function>
 
-    <function name="GetRenderbufferParameteriv" alias="GetRenderbufferParameterivEXT">
+    <function name="GetRenderbufferParameteriv"
+              alias="GetRenderbufferParameterivEXT" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="IsFramebuffer" alias="IsFramebufferEXT">
+    <function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0">
         <param name="framebuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="BindFramebuffer" alias="BindFramebufferEXT">
+    <function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="framebuffer" type="GLuint"/>
     </function>
 
-    <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT">
+    <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT"
+              es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="GenFramebuffers" alias="GenFramebuffersEXT">
+    <function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT">
+    <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT"
+              es2="2.0">
         <param name="target" type="GLenum"/>
 	<return type="GLenum"/>
     </function>
@@ -215,7 +220,8 @@
         <param name="level" type="GLint"/>
     </function>
 
-    <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT">
+    <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
@@ -240,14 +246,16 @@
         <param name="layer" type="GLint"/>
     </function>
 
-    <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT">
+    <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="renderbuffertarget" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
-    <function name="GetFramebufferAttachmentParameteriv" alias="GetFramebufferAttachmentParameterivEXT">
+    <function name="GetFramebufferAttachmentParameteriv"
+              alias="GetFramebufferAttachmentParameterivEXT" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="pname" type="GLenum"/>
@@ -267,7 +275,7 @@
         <param name="filter" type="GLenum"/>
     </function>
 
-    <function name="GenerateMipmap" alias="GenerateMipmapEXT">
+    <function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0">
         <param name="target" type="GLenum"/>
     </function>
 </category>
diff --git a/src/mapi/glapi/gen/OES_EGL_image.xml b/src/mapi/glapi/gen/OES_EGL_image.xml
index 1cb43d49a41..a995cad6c95 100644
--- a/src/mapi/glapi/gen/OES_EGL_image.xml
+++ b/src/mapi/glapi/gen/OES_EGL_image.xml
@@ -5,12 +5,14 @@
 
 <category name="GL_OES_EGL_image">
 
-    <function name="EGLImageTargetTexture2DOES" offset="assign">
+    <function name="EGLImageTargetTexture2DOES" offset="assign" es1="1.0"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="writeOffset" type="GLvoid *"/>
     </function>
 
-    <function name="EGLImageTargetRenderbufferStorageOES" offset="assign">
+    <function name="EGLImageTargetRenderbufferStorageOES" offset="assign"
+              es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="writeOffset" type="GLvoid *"/>
     </function>
diff --git a/src/mapi/glapi/gen/OES_fixed_point.xml b/src/mapi/glapi/gen/OES_fixed_point.xml
index ee408f4f1a3..974240c49c0 100644
--- a/src/mapi/glapi/gen/OES_fixed_point.xml
+++ b/src/mapi/glapi/gen/OES_fixed_point.xml
@@ -13,45 +13,52 @@
     <type name="clampx"  size="4"                                    />
 
     <!-- OpenGL ES 1.0 -->
-    <function name="AlphaFuncxOES" offset="assign" static_dispatch="false">
+    <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorxOES" offset="assign" static_dispatch="false">
+    <function name="ClearColorxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
         <param name="alpha" type="GLclampx"/>
     </function>
 
-    <function name="ClearDepthxOES" offset="assign" static_dispatch="false">
+    <function name="ClearDepthxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4xOES" offset="assign" static_dispatch="false">
+    <function name="Color4xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
         <param name="alpha" type="GLfixed"/>
     </function>
 
-    <function name="DepthRangexOES" offset="assign" static_dispatch="false">
+    <function name="DepthRangexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="FogxOES" offset="assign" static_dispatch="false">
+    <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="FogxvOES" offset="assign" static_dispatch="false">
+    <function name="FogxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="FrustumxOES" offset="assign" static_dispatch="false">
+    <function name="FrustumxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -60,53 +67,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxOES" offset="assign" static_dispatch="false">
+    <function name="LightModelxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxvOES" offset="assign" static_dispatch="false">
+    <function name="LightModelxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="LightxOES" offset="assign" static_dispatch="false">
+    <function name="LightxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightxvOES" offset="assign" static_dispatch="false">
+    <function name="LightxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="LineWidthxOES" offset="assign" static_dispatch="false">
+    <function name="LineWidthxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixxOES" offset="assign" static_dispatch="false">
+    <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MaterialxOES" offset="assign" static_dispatch="false">
+    <function name="MaterialxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="MaterialxvOES" offset="assign" static_dispatch="false">
+    <function name="MaterialxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="MultMatrixxOES" offset="assign" static_dispatch="false">
+    <function name="MultMatrixxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false">
+    <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -114,13 +131,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3xOES" offset="assign" static_dispatch="false">
+    <function name="Normal3xOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
-    <function name="OrthoxOES" offset="assign" static_dispatch="false">
+    <function name="OrthoxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -129,127 +148,149 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizexOES" offset="assign" static_dispatch="false">
+    <function name="PointSizexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false">
+    <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="RotatexOES" offset="assign" static_dispatch="false">
+    <function name="RotatexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="SampleCoveragexOES" offset="assign" static_dispatch="false">
+    <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="ScalexOES" offset="assign" static_dispatch="false">
+    <function name="ScalexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxOES" offset="assign" static_dispatch="false">
+    <function name="TexEnvxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxvOES" offset="assign" static_dispatch="false">
+    <function name="TexEnvxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="TexParameterxOES" offset="assign" static_dispatch="false">
+    <function name="TexParameterxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TranslatexOES" offset="assign" static_dispatch="false">
+    <function name="TranslatexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- OpenGL ES 1.1 -->
-    <function name="ClipPlanexOES" offset="assign" static_dispatch="false">
+    <function name="ClipPlanexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
-    <function name="GetClipPlanexOES" offset="assign" static_dispatch="false">
+    <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
-    <function name="GetFixedvOES" offset="assign" static_dispatch="false">
+    <function name="GetFixedvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetLightxvOES" offset="assign" static_dispatch="false">
+    <function name="GetLightxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetMaterialxvOES" offset="assign" static_dispatch="false">
+    <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false">
+    <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexParameterxvOES" offset="assign" static_dispatch="false">
+    <function name="GetTexParameterxvOES" offset="assign"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="PointParameterxOES" offset="assign" static_dispatch="false">
+    <function name="PointParameterxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxvOES" offset="assign" static_dispatch="false">
+    <function name="PointParameterxvOES" offset="assign"
+              static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxvOES" offset="assign" static_dispatch="false">
+    <function name="TexParameterxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <!-- texgen -->
-    <function name="GetTexGenxvOES" offset="assign" static_dispatch="false">
+    <function name="GetTexGenxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="TexGenxOES" offset="assign" static_dispatch="false">
+    <function name="TexGenxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
-    <function name="TexGenxvOES" offset="assign" static_dispatch="false">
+    <function name="TexGenxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
diff --git a/src/mapi/glapi/gen/OES_single_precision.xml b/src/mapi/glapi/gen/OES_single_precision.xml
index df8efc8f809..7d47441591e 100644
--- a/src/mapi/glapi/gen/OES_single_precision.xml
+++ b/src/mapi/glapi/gen/OES_single_precision.xml
@@ -6,26 +6,31 @@
 <OpenGLAPI>
 
 <category name="GL_OES_single_precision" number="293">
-    <function name="ClearDepthfOES" alias="ClearDepthf" static_dispatch="false">
+    <function name="ClearDepthfOES" alias="ClearDepthf" static_dispatch="false"
+              es1="1.0">
         <param name="depth" type="GLclampf"/>
     </function>
 
-    <function name="ClipPlanefOES" offset="assign" static_dispatch="false">
+    <function name="ClipPlanefOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfloat *" count="4"/>
     </function>
 
-    <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false">
+    <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false"
+              es1="1.0">
         <param name="zNear" type="GLclampf"/>
         <param name="zFar" type="GLclampf"/>
     </function>
 
-    <function name="GetClipPlanefOES" offset="assign" static_dispatch="false">
+    <function name="GetClipPlanefOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfloat *" output="true" count="4"/>
     </function>
 
-    <function name="FrustumfOES" offset="assign" static_dispatch="false">
+    <function name="FrustumfOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -34,7 +39,8 @@
         <param name="zFar" type="GLfloat"/>
     </function>
 
-    <function name="OrthofOES" offset="assign" static_dispatch="false">
+    <function name="OrthofOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index 22c087ca4bc..1fdb4d5917b 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -10,7 +10,8 @@
     <enum name="BLEND_EQUATION_RGB_OES"                   value="0x8009"/>
     <enum name="BLEND_EQUATION_ALPHA_OES"                 value="0x883D"/>
 
-    <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT" static_dispatch="false">
+    <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT"
+              static_dispatch="false" es1="1.0">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
     </function>
@@ -23,7 +24,8 @@
     <enum name="BLEND_DST_ALPHA_OES"                      value="0x80CA"/>
     <enum name="BLEND_SRC_ALPHA_OES"                      value="0x80CB"/>
 
-    <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT" static_dispatch="false">
+    <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT"
+              static_dispatch="false" es1="1.0">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
         <param name="sfactorAlpha" type="GLenum"/>
@@ -38,7 +40,8 @@
     <enum name="FUNC_SUBTRACT_OES"                        value="0x800A"/>
     <enum name="FUNC_REVERSE_SUBTRACT_OES"                value="0x800B"/>
 
-    <function name="BlendEquationOES" alias="BlendEquation" static_dispatch="false">
+    <function name="BlendEquationOES" alias="BlendEquation"
+              static_dispatch="false" es1="1.0">
         <param name="mode" type="GLenum"/>
     </function>
 </category>
@@ -69,7 +72,8 @@
 <category name="GL_OES_draw_texture" number="7">
     <enum name="TEXTURE_CROP_RECT_OES"                    value="0x8B9D"/>
 
-    <function name="DrawTexiOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexiOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
@@ -77,11 +81,13 @@
         <param name="height" type="GLint"/>
     </function>
 
-    <function name="DrawTexivOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexivOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coords" type="const GLint *" count="5"/>
     </function>
 
-    <function name="DrawTexfOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexfOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
@@ -89,11 +95,13 @@
         <param name="height" type="GLfloat"/>
     </function>
 
-    <function name="DrawTexfvOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexfvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coords" type="const GLfloat *" count="5"/>
     </function>
 
-    <function name="DrawTexsOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexsOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
@@ -101,11 +109,13 @@
         <param name="height" type="GLshort"/>
     </function>
 
-    <function name="DrawTexsvOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexsvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coords" type="const GLshort *" count="5"/>
     </function>
 
-    <function name="DrawTexxOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
@@ -113,7 +123,8 @@
         <param name="height" type="GLfixed"/>
     </function>
 
-    <function name="DrawTexxvOES" offset="assign" static_dispatch="false">
+    <function name="DrawTexxvOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="coords" type="const GLfixed *" count="5"/>
     </function>
 
@@ -166,39 +177,48 @@
     <enum name="RENDERBUFFER_STENCIL_SIZE_OES"            value="0x8D55"/>
     <enum name="RGB565_OES"                               value="0x8D62"/>
 
-    <function name="BindFramebufferOES" alias="BindFramebufferEXT" static_dispatch="false">
+    <function name="BindFramebufferOES" alias="BindFramebufferEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="framebuffer" type="GLuint"/>
     </function>
 
-    <function name="BindRenderbufferOES" alias="BindRenderbufferEXT" static_dispatch="false">
+    <function name="BindRenderbufferOES" alias="BindRenderbufferEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
-    <function name="CheckFramebufferStatusOES" alias="CheckFramebufferStatusEXT" static_dispatch="false">
+    <function name="CheckFramebufferStatusOES"
+              alias="CheckFramebufferStatusEXT" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
 	<return type="GLenum"/>
     </function>
 
-    <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT" static_dispatch="false">
+    <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT"
+              static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT" static_dispatch="false">
+    <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT"
+              static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="FramebufferRenderbufferOES" alias="FramebufferRenderbufferEXT" static_dispatch="false">
+    <function name="FramebufferRenderbufferOES"
+              alias="FramebufferRenderbufferEXT" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="renderbuffertarget" type="GLenum"/>
         <param name="renderbuffer" type="GLuint"/>
     </function>
 
-    <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT" static_dispatch="false">
+    <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
@@ -206,44 +226,54 @@
         <param name="level" type="GLint"/>
     </function>
 
-    <function name="GenerateMipmapOES" alias="GenerateMipmapEXT" static_dispatch="false">
+    <function name="GenerateMipmapOES" alias="GenerateMipmapEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
     </function>
 
-    <function name="GenFramebuffersOES" alias="GenFramebuffersEXT" static_dispatch="false">
+    <function name="GenFramebuffersOES" alias="GenFramebuffersEXT"
+              static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="framebuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT" static_dispatch="false">
+    <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT"
+              static_dispatch="false" es1="1.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="renderbuffers" type="GLuint *" count="n" output="true"/>
     </function>
 
-    <function name="GetFramebufferAttachmentParameterivOES" alias="GetFramebufferAttachmentParameterivEXT" static_dispatch="false">
+    <function name="GetFramebufferAttachmentParameterivOES"
+              alias="GetFramebufferAttachmentParameterivEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="GetRenderbufferParameterivOES" alias="GetRenderbufferParameterivEXT" static_dispatch="false">
+    <function name="GetRenderbufferParameterivOES"
+              alias="GetRenderbufferParameterivEXT" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="IsFramebufferOES" alias="IsFramebufferEXT" static_dispatch="false">
+    <function name="IsFramebufferOES" alias="IsFramebufferEXT"
+              static_dispatch="false" es1="1.0">
         <param name="framebuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="IsRenderbufferOES" alias="IsRenderbufferEXT" static_dispatch="false">
+    <function name="IsRenderbufferOES" alias="IsRenderbufferEXT"
+              static_dispatch="false" es1="1.0">
         <param name="renderbuffer" type="GLuint"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT" static_dispatch="false">
+    <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="internalformat" type="GLenum"/>
         <param name="width" type="GLsizei"/>
@@ -308,7 +338,8 @@
     <enum name="POINT_SIZE_ARRAY_OES"                     value="0x8B9C"/>
     <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES"	  value="0x8B9F"/>
 
-    <function name="PointSizePointerOES" offset="assign" static_dispatch="false">
+    <function name="PointSizePointerOES" offset="assign"
+              static_dispatch="false" es1="1.0">
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
         <param name="pointer" type="const GLvoid *"/>
@@ -323,7 +354,8 @@
 
 <!-- optional for es1.0 -->
 <category name="GL_OES_query_matrix" number="16">
-    <function name="QueryMatrixxOES" offset="assign" static_dispatch="false">
+    <function name="QueryMatrixxOES" offset="assign" static_dispatch="false"
+              es1="1.0">
         <param name="mantissa" type="GLfixed *" count="16" />
         <param name="exponent" type="GLint *" count="16" />
 	<return type="GLbitfield"/>
@@ -352,37 +384,43 @@
     <enum name="MAX_CUBE_MAP_TEXTURE_SIZE_OES"            value="0x851C"/>
     <enum name="TEXTURE_GEN_STR_OES"                      value="0x8D60"/>
 
-    <function name="GetTexGenfvOES" alias="GetTexGenfv" static_dispatch="false">
+    <function name="GetTexGenfvOES" alias="GetTexGenfv" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexGenivOES" alias="GetTexGeniv" static_dispatch="false">
+    <function name="GetTexGenivOES" alias="GetTexGeniv" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="TexGenfOES" alias="TexGenf" static_dispatch="false">
+    <function name="TexGenfOES" alias="TexGenf" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="TexGenfvOES" alias="TexGenfv" static_dispatch="false">
+    <function name="TexGenfvOES" alias="TexGenfv" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
     </function>
 
-    <function name="TexGeniOES" alias="TexGeni" static_dispatch="false">
+    <function name="TexGeniOES" alias="TexGeni" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
     </function>
 
-    <function name="TexGenivOES" alias="TexGeniv" static_dispatch="false">
+    <function name="TexGenivOES" alias="TexGeniv" static_dispatch="false"
+              es1="1.0">
         <param name="coord" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
@@ -417,19 +455,22 @@
     <enum name="BUFFER_MAPPED_OES"                        value="0x88BC"/>
     <enum name="BUFFER_MAP_POINTER_OES"                   value="0x88BD"/>
 
-    <function name="GetBufferPointervOES" alias="GetBufferPointervARB" static_dispatch="false">
+    <function name="GetBufferPointervOES" alias="GetBufferPointervARB"
+              static_dispatch="false" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **"/>
     </function>
 
-    <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false">
+    <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false"
+              es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="access" type="GLenum"/>
 	<return type="GLvoid *"/>
     </function>
 
-    <function name="UnmapBufferOES" alias="UnmapBufferARB" static_dispatch="false">
+    <function name="UnmapBufferOES" alias="UnmapBufferARB"
+              static_dispatch="false" es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
 	<return type="GLboolean"/>
     </function>
@@ -460,7 +501,8 @@
     <enum name="SAMPLER_3D_OES"                           value="0x8B5F"/>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/>
 
-    <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB" static_dispatch="false">
+    <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB"
+              static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -472,7 +514,9 @@
         <param name="data" type="const GLvoid *" count="imageSize"/>
     </function>
 
-    <function name="CompressedTexSubImage3DOES" alias="CompressedTexSubImage3DARB" static_dispatch="false">
+    <function name="CompressedTexSubImage3DOES"
+              alias="CompressedTexSubImage3DARB" static_dispatch="false"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -486,7 +530,8 @@
         <param name="data" type="const GLvoid *" count="imageSize"/>
     </function>
 
-    <function name="CopyTexSubImage3DOES" alias="CopyTexSubImage3D" static_dispatch="false">
+    <function name="CopyTexSubImage3DOES" alias="CopyTexSubImage3D"
+              static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -498,7 +543,8 @@
         <param name="height" type="GLsizei"/>
     </function>
 
-    <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT" static_dispatch="false">
+    <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT"
+              static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="textarget" type="GLenum"/>
@@ -507,7 +553,8 @@
         <param name="zoffset" type="GLint"/>
     </function>
 
-    <function name="TexImage3DOES" alias="TexImage3D" static_dispatch="false">
+    <function name="TexImage3DOES" alias="TexImage3D" static_dispatch="false"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -520,7 +567,8 @@
         <param name="pixels" type="const GLvoid *" img_width="width" img_height="height" img_depth="depth" img_format="format" img_type="type" img_target="target" img_null_flag="true" img_pad_dimensions="true"/>
     </function>
 
-    <function name="TexSubImage3DOES" alias="TexSubImage3D" static_dispatch="false">
+    <function name="TexSubImage3DOES" alias="TexSubImage3D"
+              static_dispatch="false" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -578,7 +626,8 @@
     <enum name="NUM_PROGRAM_BINARY_FORMATS_OES"           value="0x87FE"/>
     <enum name="PROGRAM_BINARY_FORMATS_OES"               value="0x87FF"/>
 
-    <function name="GetProgramBinaryOES" alias="GetProgramBinary" static_dispatch="false">
+    <function name="GetProgramBinaryOES" alias="GetProgramBinary"
+              static_dispatch="false" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *"/>
@@ -586,7 +635,8 @@
         <param name="binary" type="GLvoid *"/>
     </function>
 
-    <function name="ProgramBinaryOES" alias="ProgramBinary" static_dispatch="false">
+    <function name="ProgramBinaryOES" alias="ProgramBinary"
+              static_dispatch="false" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="binaryFormat" type="GLenum"/>
         <param name="binary" type="const GLvoid *"/>
@@ -621,21 +671,22 @@
 
 <!-- 71. GL_OES_vertex_array_object -->
 <category name="GL_OES_vertex_array_object" number="71">
-    <function name="BindVertexArrayOES" alias="BindVertexArray">
+    <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0">
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE">
+    <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE"
+              es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="const GLuint *" count="n"/>
     </function>
 
-    <function name="GenVertexArraysOES" alias="GenVertexArrays">
+    <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="GLuint *" output="true" count="n"/>
     </function>
 
-    <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE">
+    <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0">
         <param name="array" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
@@ -710,7 +761,7 @@
         <size name="Get" mode="get"/>
     </enum>
 
-    <function name="DrawBuffersNV" alias="DrawBuffersARB">
+    <function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="bufs" type="const GLenum *" count="n"/>
     </function>
@@ -718,7 +769,7 @@
 
 <!-- 93. GL_NV_read_buffer -->
 <category name="NV_read_buffer">
-    <function name="ReadBufferNV" alias="ReadBuffer">
+    <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0">
         <param name="mode" type="GLenum"/>
     </function>
 </category>
@@ -746,7 +797,8 @@
     <enum name="MAP_FLUSH_EXPLICIT_BIT_EXT"               value="0x0010"/>
     <enum name="MAP_UNSYNCHRONIZED_BIT_EXT"               value="0x0020"/>
 
-    <function name="MapBufferRangeEXT" alias="MapBufferRange">
+    <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="size" type="GLsizeiptr"/>
@@ -754,7 +806,8 @@
         <return type="GLvoid *"/>
     </function>
 
-    <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange">
+    <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange"
+              es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="length" type="GLsizeiptr"/>
diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mapi/glapi/gen/gl_API.dtd
index 149a433ca7a..db33500c0f3 100644
--- a/src/mapi/glapi/gen/gl_API.dtd
+++ b/src/mapi/glapi/gen/gl_API.dtd
@@ -35,7 +35,9 @@
                    alias               NMTOKEN #IMPLIED
                    offset              CDATA   #IMPLIED
                    static_dispatch     (true | false) "true"
-                   vectorequiv         NMTOKEN #IMPLIED>
+                   vectorequiv         NMTOKEN #IMPLIED
+                   es1                 CDATA   "none"
+                   es2                 CDATA   "none">
 <!ATTLIST size     name                NMTOKEN #REQUIRED
                    count               NMTOKEN #IMPLIED
                    mode                (get | set) "set">
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index f83a7a71836..10135018725 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1275,7 +1275,7 @@
         <glx rop="15"/>
     </function>
 
-    <function name="Color4f" offset="29" vectorequiv="Color4fv">
+    <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
@@ -1311,7 +1311,7 @@
         <glx rop="18"/>
     </function>
 
-    <function name="Color4ub" offset="35" vectorequiv="Color4ubv">
+    <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
@@ -1418,7 +1418,7 @@
         <glx rop="29"/>
     </function>
 
-    <function name="Normal3f" offset="56" vectorequiv="Normal3fv">
+    <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0">
         <param name="nx" type="GLfloat"/>
         <param name="ny" type="GLfloat"/>
         <param name="nz" type="GLfloat"/>
@@ -1947,18 +1947,18 @@
         <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">
         <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">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="81"/>
@@ -1976,25 +1976,25 @@
         <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">
         <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">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
@@ -2015,13 +2015,13 @@
         <glx rop="89"/>
     </function>
 
-    <function name="LightModelf" offset="163">
+    <function name="LightModelf" offset="163" es1="1.0">
         <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">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
         <glx rop="91"/>
@@ -2045,19 +2045,19 @@
         <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">
         <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">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"/>
@@ -2078,7 +2078,7 @@
         <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>
@@ -2094,7 +2094,7 @@
         <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 +2102,33 @@
         <glx rop="103"/>
     </function>
 
-    <function name="ShadeModel" offset="177">
+    <function name="ShadeModel" offset="177" es1="1.0">
         <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 +2147,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,28 +2160,28 @@
         <glx rop="110" large="true"/>
     </function>
 
-    <function name="TexEnvf" offset="184">
+    <function name="TexEnvf" offset="184" es1="1.0">
         <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">
         <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">
         <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">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"/>
@@ -2277,7 +2277,7 @@
         <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>
@@ -2295,7 +2295,7 @@
         <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 +2303,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 +2313,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,7 +2326,7 @@
         <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>
@@ -2342,21 +2342,21 @@
         <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>
 
@@ -2516,38 +2516,38 @@
         <glx rop="158"/>
     </function>
 
-    <function name="AlphaFunc" offset="240">
+    <function name="AlphaFunc" offset="240" es1="1.0">
         <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>
@@ -2576,7 +2576,7 @@
         <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"/>
@@ -2617,7 +2617,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"/>
@@ -2637,7 +2637,7 @@
         <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"/>
@@ -2655,24 +2655,24 @@
         <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">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
@@ -2707,7 +2707,7 @@
         <glx sop="122"/>
     </function>
 
-    <function name="GetMaterialfv" offset="269">
+    <function name="GetMaterialfv" offset="269" es1="1.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
@@ -2744,20 +2744,20 @@
         <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">
         <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">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
@@ -2794,14 +2794,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,7 +2824,7 @@
         <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"/>
@@ -2852,11 +2852,11 @@
         <glx rop="175"/>
     </function>
 
-    <function name="LoadIdentity" offset="290">
+    <function name="LoadIdentity" offset="290" es1="1.0">
         <glx rop="176"/>
     </function>
 
-    <function name="LoadMatrixf" offset="291">
+    <function name="LoadMatrixf" offset="291" es1="1.0">
         <param name="m" type="const GLfloat *" count="16"/>
         <glx rop="177"/>
     </function>
@@ -2866,12 +2866,12 @@
         <glx rop="178"/>
     </function>
 
-    <function name="MatrixMode" offset="293">
+    <function name="MatrixMode" offset="293" es1="1.0">
         <param name="mode" type="GLenum"/>
         <glx rop="179"/>
     </function>
 
-    <function name="MultMatrixf" offset="294">
+    <function name="MultMatrixf" offset="294" es1="1.0">
         <param name="m" type="const GLfloat *" count="16"/>
         <glx rop="180"/>
     </function>
@@ -2891,11 +2891,11 @@
         <glx rop="182"/>
     </function>
 
-    <function name="PopMatrix" offset="297">
+    <function name="PopMatrix" offset="297" es1="1.0">
         <glx rop="183"/>
     </function>
 
-    <function name="PushMatrix" offset="298">
+    <function name="PushMatrix" offset="298" es1="1.0">
         <glx rop="184"/>
     </function>
 
@@ -2907,7 +2907,7 @@
         <glx rop="185"/>
     </function>
 
-    <function name="Rotatef" offset="300">
+    <function name="Rotatef" offset="300" es1="1.0">
         <param name="angle" type="GLfloat"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -2922,7 +2922,7 @@
         <glx rop="187"/>
     </function>
 
-    <function name="Scalef" offset="302">
+    <function name="Scalef" offset="302" es1="1.0">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
@@ -2936,14 +2936,14 @@
         <glx rop="189"/>
     </function>
 
-    <function name="Translatef" offset="304">
+    <function name="Translatef" offset="304" es1="1.0">
         <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"/>
@@ -3131,7 +3131,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="ColorPointer" offset="308">
+    <function name="ColorPointer" offset="308" es1="1.0">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3139,19 +3139,19 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="DisableClientState" offset="309">
+    <function name="DisableClientState" offset="309" es1="1.0">
         <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">
         <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">
         <param name="mode" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="type" type="GLenum"/>
@@ -3165,12 +3165,12 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="EnableClientState" offset="313">
+    <function name="EnableClientState" offset="313" es1="1.0">
         <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"/>
@@ -3190,14 +3190,14 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="NormalPointer" offset="318">
+    <function name="NormalPointer" offset="318" es1="1.0">
         <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">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3205,7 +3205,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexPointer" offset="321">
+    <function name="VertexPointer" offset="321" es1="1.0">
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
         <param name="stride" type="GLsizei"/>
@@ -3213,7 +3213,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"/>
@@ -3230,7 +3230,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"/>
@@ -3252,7 +3252,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"/>
@@ -3276,7 +3276,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"/>
@@ -3298,25 +3298,25 @@
         <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"/>
@@ -3695,7 +3695,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"/>
@@ -3703,7 +3703,7 @@
         <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>
@@ -4232,11 +4232,13 @@
     <enum name="DOT3_RGB"                                 value="0x86AE"/>
     <enum name="DOT3_RGBA"                                value="0x86AF"/>
 
-    <function name="ActiveTexture" alias="ActiveTextureARB">
+    <function name="ActiveTexture" alias="ActiveTextureARB" es1="1.0"
+              es2="2.0">
         <param name="texture" type="GLenum"/>
     </function>
 
-    <function name="ClientActiveTexture" alias="ClientActiveTextureARB">
+    <function name="ClientActiveTexture" alias="ClientActiveTextureARB"
+              es1="1.0">
         <param name="texture" type="GLenum"/>
     </function>
 
@@ -4385,7 +4387,7 @@
         <param name="v" type="const GLdouble *"/>
     </function>
 
-    <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB">
+    <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -4440,7 +4442,8 @@
         <param name="m" type="const GLdouble *"/>
     </function>
 
-    <function name="SampleCoverage" alias="SampleCoverageARB">
+    <function name="SampleCoverage" alias="SampleCoverageARB" es1="1.0"
+              es2="2.0">
         <param name="value" type="GLclampf"/>
         <param name="invert" type="GLboolean"/>
     </function>
@@ -4457,7 +4460,8 @@
         <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB">
+    <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB"
+              es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4492,7 +4496,8 @@
         <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB">
+    <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB"
+              es1="1.0" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4636,7 +4641,7 @@
     </enum>
     <enum name="COMPARE_R_TO_TEXTURE"                     value="0x884E"/>
 
-    <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT">
+    <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT" es2="2.0">
         <param name="sfactorRGB" type="GLenum"/>
         <param name="dfactorRGB" type="GLenum"/>
         <param name="sfactorAlpha" type="GLenum"/>
@@ -4680,12 +4685,12 @@
         <param name="primcount" type="GLsizei"/>
     </function>
 
-    <function name="PointParameterf" alias="PointParameterfEXT">
+    <function name="PointParameterf" alias="PointParameterfEXT" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="PointParameterfv" alias="PointParameterfvEXT">
+    <function name="PointParameterfv" alias="PointParameterfvEXT" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
     </function>
@@ -4929,36 +4934,39 @@
     <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" alias="BindBufferARB" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="buffer" type="GLuint"/>
     </function>
 
-    <function name="BufferData" alias="BufferDataARB">
+    <function name="BufferData" alias="BufferDataARB" es1="1.1" es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="size" type="GLsizeiptr"/>
         <param name="data" type="const GLvoid *"/>
         <param name="usage" type="GLenum"/>
     </function>
 
-    <function name="BufferSubData" alias="BufferSubDataARB">
+    <function name="BufferSubData" alias="BufferSubDataARB" es1="1.1"
+              es2="2.0">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="size" type="GLsizeiptr"/>
         <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="DeleteBuffers" alias="DeleteBuffersARB">
+    <function name="DeleteBuffers" alias="DeleteBuffersARB" es1="1.1"
+              es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="buffer" type="const GLuint *"/>
     </function>
 
-    <function name="GenBuffers" alias="GenBuffersARB">
+    <function name="GenBuffers" alias="GenBuffersARB" es1="1.1" es2="2.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="buffer" type="GLuint *" output="true" count="n"/>
     </function>
 
-    <function name="GetBufferParameteriv" alias="GetBufferParameterivARB">
+    <function name="GetBufferParameteriv" alias="GetBufferParameterivARB"
+              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"/>
@@ -4977,7 +4985,7 @@
         <param name="data" type="GLvoid *" output="true"/>
     </function>
 
-    <function name="IsBuffer" alias="IsBufferARB">
+    <function name="IsBuffer" alias="IsBufferARB" es1="1.1" es2="2.0">
         <param name="buffer" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
@@ -5131,7 +5139,8 @@
     <enum name="STENCIL_BACK_VALUE_MASK"          value="0x8CA4"/>
     <enum name="STENCIL_BACK_WRITEMASK"           value="0x8CA5"/>
 
-    <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT">
+    <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT"
+              es2="2.0">
         <param name="modeRGB" type="GLenum"/>
         <param name="modeA" type="GLenum"/>
     </function>
@@ -5141,7 +5150,7 @@
         <param name="bufs" type="const GLenum *" count="n"/>
     </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"/>
@@ -5149,7 +5158,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"/>
@@ -5157,68 +5166,71 @@
         <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" alias="BindAttribLocationARB"
+              es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="CompileShader" alias="CompileShaderARB">
+    <function name="CompileShader" alias="CompileShaderARB" es2="2.0">
         <param name="shader" type="GLuint"/>
         <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"
+              alias="DisableVertexAttribArrayARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB">
+    <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB"
+              es2="2.0">
         <param name="index" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetActiveAttrib" alias="GetActiveAttribARB">
+    <function name="GetActiveAttrib" alias="GetActiveAttribARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei "/>
@@ -5229,7 +5241,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetActiveUniform" alias="GetActiveUniformARB">
+    <function name="GetActiveUniform" alias="GetActiveUniformARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="index" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
@@ -5240,7 +5252,7 @@
         <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"/>
@@ -5248,21 +5260,21 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetAttribLocation" alias="GetAttribLocationARB">
+    <function name="GetAttribLocation" alias="GetAttribLocationARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <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 *"/>
         <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 *"/>
@@ -5270,14 +5282,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 *"/>
@@ -5285,7 +5297,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetShaderSource" alias="GetShaderSourceARB">
+    <function name="GetShaderSource" alias="GetShaderSourceARB" es2="2.0">
         <param name="shader" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *" output="true"/>
@@ -5293,21 +5305,22 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformLocation" alias="GetUniformLocationARB">
+    <function name="GetUniformLocation" alias="GetUniformLocationARB"
+              es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformfv" alias="GetUniformfvARB">
+    <function name="GetUniformfv" alias="GetUniformfvARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLfloat *" output="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetUniformiv" alias="GetUniformivARB">
+    <function name="GetUniformiv" alias="GetUniformivARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLint *"/>
@@ -5321,45 +5334,46 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB">
+    <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetVertexAttribiv" alias="GetVertexAttribivARB">
+    <function name="GetVertexAttribiv" alias="GetVertexAttribivARB" es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV">
+    <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV"
+              es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="pointer" type="GLvoid **" output="true"/>
         <glx ignore="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" alias="LinkProgramARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="ShaderSource" alias="ShaderSourceARB">
+    <function name="ShaderSource" alias="ShaderSourceARB" es2="2.0">
         <param name="shader" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="string" type="const GLchar * const *"/>
@@ -5367,30 +5381,30 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="UseProgram" alias="UseProgramObjectARB">
+    <function name="UseProgram" alias="UseProgramObjectARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1f" alias="Uniform1fARB">
+    <function name="Uniform1f" alias="Uniform1fARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2f" alias="Uniform2fARB">
+    <function name="Uniform2f" alias="Uniform2fARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3f" alias="Uniform3fARB">
+    <function name="Uniform3f" alias="Uniform3fARB" es2="2.0">
         <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="Uniform4f" alias="Uniform4fARB">
+    <function name="Uniform4f" alias="Uniform4fARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLfloat"/>
         <param name="v1" type="GLfloat"/>
@@ -5399,25 +5413,25 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1i" alias="Uniform1iARB">
+    <function name="Uniform1i" alias="Uniform1iARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2i" alias="Uniform2iARB">
+    <function name="Uniform2i" alias="Uniform2iARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3i" alias="Uniform3iARB">
+    <function name="Uniform3i" alias="Uniform3iARB" es2="2.0">
         <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="Uniform4i" alias="Uniform4iARB">
+    <function name="Uniform4i" alias="Uniform4iARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="v0" type="GLint"/>
         <param name="v1" type="GLint"/>
@@ -5426,71 +5440,71 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1fv" alias="Uniform1fvARB">
+    <function name="Uniform1fv" alias="Uniform1fvARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2fv" alias="Uniform2fvARB">
+    <function name="Uniform2fv" alias="Uniform2fvARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3fv" alias="Uniform3fvARB">
+    <function name="Uniform3fv" alias="Uniform3fvARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform4fv" alias="Uniform4fvARB">
+    <function name="Uniform4fv" alias="Uniform4fvARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="Uniform1iv" alias="Uniform1ivARB">
+    <function name="Uniform1iv" alias="Uniform1ivARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform2iv" alias="Uniform2ivARB">
+    <function name="Uniform2iv" alias="Uniform2ivARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform3iv" alias="Uniform3ivARB">
+    <function name="Uniform3iv" alias="Uniform3ivARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
-    <function name="Uniform4iv" alias="Uniform4ivARB">
+    <function name="Uniform4iv" alias="Uniform4ivARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="value" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB">
+    <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB" es2="2.0">
         <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="UniformMatrix3fv" alias="UniformMatrix3fvARB">
+    <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB" es2="2.0">
         <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="UniformMatrix4fv" alias="UniformMatrix4fvARB">
+    <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB" es2="2.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
@@ -5498,7 +5512,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="ValidateProgram" alias="ValidateProgramARB">
+    <function name="ValidateProgram" alias="ValidateProgramARB" es2="2.0">
         <param name="program" type="GLuint"/>
         <glx ignore="true"/>
     </function>
@@ -5511,11 +5525,11 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *"/>
     </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>
@@ -5537,12 +5551,12 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *"/>
     </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>
@@ -5566,13 +5580,13 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *"/>
     </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>
@@ -5633,14 +5647,14 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *"/>
     </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>
@@ -5672,7 +5686,8 @@
         <param name="v" type="const GLushort *" count="4"/>
     </function>
 
-    <function name="VertexAttribPointer" alias="VertexAttribPointerARB">
+    <function name="VertexAttribPointer" alias="VertexAttribPointerARB"
+              es2="2.0">
         <param name="index" type="GLuint"/>
         <param name="size" type="GLint"/>
         <param name="type" type="GLenum"/>
@@ -9900,7 +9915,7 @@
 </category>
 
 <category name="GL_EXT_multi_draw_arrays" number="148">
-    <function name="MultiDrawArraysEXT" offset="assign">
+    <function name="MultiDrawArraysEXT" offset="assign" es1="1.0" es2="2.0">
         <param name="mode" type="GLenum"/>
         <param name="first" type="const GLint *"/>
         <param name="count" type="const GLsizei *"/>
@@ -9908,7 +9923,7 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="MultiDrawElementsEXT" offset="assign">
+    <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0">
         <param name="mode" type="GLenum"/>
         <param name="count" type="const GLsizei *"/>
         <param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/gl_and_es_API.xml b/src/mapi/glapi/gen/gl_and_es_API.xml
index 1313da0f5d6..52710415736 100644
--- a/src/mapi/glapi/gen/gl_and_es_API.xml
+++ b/src/mapi/glapi/gen/gl_and_es_API.xml
@@ -24,45 +24,51 @@
     <type name="fixed"   size="4"                                    />
     <type name="clampx"  size="4"                                    />
 
-    <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false">
+    <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false"
+              es1="1.0">
         <param name="func" type="GLenum"/>
         <param name="ref" type="GLclampx"/>
     </function>
 
-    <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false">
+    <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLclampx"/>
         <param name="green" type="GLclampx"/>
         <param name="blue" type="GLclampx"/>
         <param name="alpha" type="GLclampx"/>
     </function>
 
-    <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false">
+    <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false"
+              es1="1.0">
         <param name="depth" type="GLclampx"/>
     </function>
 
-    <function name="Color4x" alias="Color4xOES" static_dispatch="false">
+    <function name="Color4x" alias="Color4xOES" static_dispatch="false"
+              es1="1.0">
         <param name="red" type="GLfixed"/>
         <param name="green" type="GLfixed"/>
         <param name="blue" type="GLfixed"/>
         <param name="alpha" type="GLfixed"/>
     </function>
 
-    <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false">
+    <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false"
+              es1="1.0">
         <param name="zNear" type="GLclampx"/>
         <param name="zFar" type="GLclampx"/>
     </function>
 
-    <function name="Fogx" alias="FogxOES" static_dispatch="false">
+    <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Fogxv" alias="FogxvOES" static_dispatch="false">
+    <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Frustumx" alias="FrustumxOES" static_dispatch="false">
+    <function name="Frustumx" alias="FrustumxOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -71,53 +77,63 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="LightModelx" alias="LightModelxOES" static_dispatch="false">
+    <function name="LightModelx" alias="LightModelxOES" static_dispatch="false"
+              es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="LightModelxv" alias="LightModelxvOES" static_dispatch="false">
+    <function name="LightModelxv" alias="LightModelxvOES"
+              static_dispatch="false" es1="1.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="Lightx" alias="LightxOES" static_dispatch="false">
+    <function name="Lightx" alias="LightxOES" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Lightxv" alias="LightxvOES" static_dispatch="false">
+    <function name="Lightxv" alias="LightxvOES" static_dispatch="false"
+              es1="1.0">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false">
+    <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false"
+              es1="1.0">
         <param name="width" type="GLfixed"/>
     </function>
 
-    <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false">
+    <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="Materialx" alias="MaterialxOES" static_dispatch="false">
+    <function name="Materialx" alias="MaterialxOES" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false">
+    <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false"
+              es1="1.0">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false">
+    <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false"
+              es1="1.0">
         <param name="m" type="const GLfixed *" count="16"/>
     </function>
 
-    <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" static_dispatch="false">
+    <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfixed"/>
         <param name="t" type="GLfixed"/>
@@ -125,13 +141,15 @@
         <param name="q" type="GLfixed"/>
     </function>
 
-    <function name="Normal3x" alias="Normal3xOES" static_dispatch="false">
+    <function name="Normal3x" alias="Normal3xOES" static_dispatch="false"
+              es1="1.0">
         <param name="nx" type="GLfixed"/>
         <param name="ny" type="GLfixed"/>
         <param name="nz" type="GLfixed"/>
     </function>
 
-    <function name="Orthox" alias="OrthoxOES" static_dispatch="false">
+    <function name="Orthox" alias="OrthoxOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfixed"/>
         <param name="right" type="GLfixed"/>
         <param name="bottom" type="GLfixed"/>
@@ -140,59 +158,69 @@
         <param name="zFar" type="GLfixed"/>
     </function>
 
-    <function name="PointSizex" alias="PointSizexOES" static_dispatch="false">
+    <function name="PointSizex" alias="PointSizexOES" static_dispatch="false"
+              es1="1.0">
         <param name="size" type="GLfixed"/>
     </function>
 
-    <function name="PolygonOffsetx" alias="PolygonOffsetxOES" static_dispatch="false">
+    <function name="PolygonOffsetx" alias="PolygonOffsetxOES"
+              static_dispatch="false" es1="1.0">
         <param name="factor" type="GLfixed"/>
         <param name="units" type="GLfixed"/>
     </function>
 
-    <function name="Rotatex" alias="RotatexOES" static_dispatch="false">
+    <function name="Rotatex" alias="RotatexOES" static_dispatch="false"
+              es1="1.0">
         <param name="angle" type="GLfixed"/>
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="SampleCoveragex" alias="SampleCoveragexOES" static_dispatch="false">
+    <function name="SampleCoveragex" alias="SampleCoveragexOES"
+              static_dispatch="false" es1="1.0">
         <param name="value" type="GLclampx"/>
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="Scalex" alias="ScalexOES" static_dispatch="false">
+    <function name="Scalex" alias="ScalexOES" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false">
+    <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false">
+    <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false"
+              es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
-    <function name="TexParameterx" alias="TexParameterxOES" static_dispatch="false">
+    <function name="TexParameterx" alias="TexParameterxOES"
+              static_dispatch="false" es1="1.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="Translatex" alias="TranslatexOES" static_dispatch="false">
+    <function name="Translatex" alias="TranslatexOES" static_dispatch="false"
+              es1="1.0">
         <param name="x" type="GLfixed"/>
         <param name="y" type="GLfixed"/>
         <param name="z" type="GLfixed"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="Frustumf" alias="FrustumfOES" static_dispatch="false">
+    <function name="Frustumf" alias="FrustumfOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -201,7 +229,8 @@
         <param name="zFar" type="GLfloat"/>
     </function>
 
-    <function name="Orthof" alias="OrthofOES" static_dispatch="false">
+    <function name="Orthof" alias="OrthofOES" static_dispatch="false"
+              es1="1.0">
         <param name="left" type="GLfloat"/>
         <param name="right" type="GLfloat"/>
         <param name="bottom" type="GLfloat"/>
@@ -213,68 +242,80 @@
 
 <category name="es1.1">
     <!-- from GL_OES_fixed_point -->
-    <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false">
+    <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false"
+              es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfixed *" count="4"/>
     </function>
 
-    <function name="GetClipPlanex" alias="GetClipPlanexOES" static_dispatch="false">
+    <function name="GetClipPlanex" alias="GetClipPlanexOES"
+              static_dispatch="false" es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfixed *" output="true" count="4"/>
     </function>
 
-    <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false">
+    <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false"
+              es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false">
+    <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false"
+              es1="1.1">
         <param name="light" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetMaterialxv" alias="GetMaterialxvOES" static_dispatch="false">
+    <function name="GetMaterialxv" alias="GetMaterialxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false">
+    <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false"
+              es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetTexParameterxv" alias="GetTexParameterxvOES" static_dispatch="false">
+    <function name="GetTexParameterxv" alias="GetTexParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfixed *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="PointParameterx" alias="PointParameterxOES" static_dispatch="false">
+    <function name="PointParameterx" alias="PointParameterxOES"
+              static_dispatch="false" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfixed"/>
     </function>
 
-    <function name="PointParameterxv" alias="PointParameterxvOES" static_dispatch="false">
+    <function name="PointParameterxv" alias="PointParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *"/>
     </function>
 
-    <function name="TexParameterxv" alias="TexParameterxvOES" static_dispatch="false">
+    <function name="TexParameterxv" alias="TexParameterxvOES"
+              static_dispatch="false" es1="1.1">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfixed *" variable_param="pname"/>
     </function>
 
     <!-- from GL_OES_single_precision -->
-    <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false">
+    <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false"
+              es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="const GLfloat *" count="4"/>
     </function>
 
-    <function name="GetClipPlanef" alias="GetClipPlanefOES" static_dispatch="false">
+    <function name="GetClipPlanef" alias="GetClipPlanefOES"
+              static_dispatch="false" es1="1.1">
         <param name="plane" type="GLenum"/>
         <param name="equation" type="GLfloat *" output="true" count="4"/>
     </function>
-- 
2.30.2