diff --git a/src/mapi/glapi/gen/ARB_copy_buffer.xml b/src/mapi/glapi/gen/ARB_copy_buffer.xml
index 719816d817e..6982ed1d26f 100644
--- a/src/mapi/glapi/gen/ARB_copy_buffer.xml
+++ b/src/mapi/glapi/gen/ARB_copy_buffer.xml
@@ -11,7 +11,7 @@
     <enum name="COPY_READ_BUFFER"   value="0x8F36"/>
     <enum name="COPY_WRITE_BUFFER"  value="0x8F37"/>
 
-    <function name="CopyBufferSubData" offset="assign">
+    <function name="CopyBufferSubData" offset="assign" es2="3.0">
         <param name="readTarget" type="GLenum"/>
         <param name="writeTarget" type="GLenum"/>
         <param name="readOffset" type="GLintptr"/>
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index 7777fdbd6f8..c9649aced8d 100644
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -169,7 +169,7 @@
         <param name="height" type="GLsizei"/>
     </function>
 
-    <function name="RenderbufferStorageMultisample" offset="assign">
+    <function name="RenderbufferStorageMultisample" offset="assign" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="samples" type="GLsizei"/>
         <param name="internalformat" type="GLenum"/>
@@ -238,7 +238,7 @@
         <param name="zoffset" type="GLint"/>
     </function>
 
-    <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT">
+    <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
@@ -262,7 +262,7 @@
         <param name="params" type="GLint *" output="true"/>
     </function>
 
-    <function name="BlitFramebuffer" alias="BlitFramebufferEXT">
+    <function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0">
         <param name="srcX0" type="GLint"/>
         <param name="srcY0" type="GLint"/>
         <param name="srcX1" type="GLint"/>
diff --git a/src/mapi/glapi/gen/ARB_get_program_binary.xml b/src/mapi/glapi/gen/ARB_get_program_binary.xml
index a3665e54021..8da5c41e8fd 100644
--- a/src/mapi/glapi/gen/ARB_get_program_binary.xml
+++ b/src/mapi/glapi/gen/ARB_get_program_binary.xml
@@ -11,7 +11,7 @@
     <enum name="NUM_PROGRAM_BINARY_FORMATS"               value="0x87FE"/>
     <enum name="PROGRAM_BINARY_FORMATS"                   value="0x87FF"/>
 
-    <function name="GetProgramBinary" offset="assign" static_dispatch="false">
+    <function name="GetProgramBinary" offset="assign" static_dispatch="false" es2="3.0">
         <param name="program" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *"/>
@@ -19,14 +19,14 @@
         <param name="binary" type="GLvoid *"/>
     </function>
 
-    <function name="ProgramBinary" offset="assign" static_dispatch="false">
+    <function name="ProgramBinary" offset="assign" static_dispatch="false" es2="3.0">
         <param name="program" type="GLuint"/>
         <param name="binaryFormat" type="GLenum"/>
         <param name="binary" type="const GLvoid *"/>
         <param name="length" type="GLsizei"/>
     </function>
 
-    <function name="ProgramParameteri" offset="assign" static_dispatch="false">
+    <function name="ProgramParameteri" offset="assign" static_dispatch="false" es2="3.0">
         <param name="program" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="value" type="GLint"/>
diff --git a/src/mapi/glapi/gen/ARB_invalidate_subdata.xml b/src/mapi/glapi/gen/ARB_invalidate_subdata.xml
index 3e4ffc300be..31b515cdb85 100644
--- a/src/mapi/glapi/gen/ARB_invalidate_subdata.xml
+++ b/src/mapi/glapi/gen/ARB_invalidate_subdata.xml
@@ -29,7 +29,7 @@
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="InvalidateSubFramebuffer" offset="assign">
+  <function name="InvalidateSubFramebuffer" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="numAttachments" type="GLsizei" counter="true"/>
     <param name="attachments" type="const GLenum *" count="numAttachments"/>
@@ -39,7 +39,7 @@
     <param name="height" type="GLsizei"/>
   </function>
 
-  <function name="InvalidateFramebuffer" offset="assign">
+  <function name="InvalidateFramebuffer" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="numAttachments" type="GLsizei" counter="true"/>
     <param name="attachments" type="const GLenum *" count="numAttachments"/>
diff --git a/src/mapi/glapi/gen/ARB_map_buffer_range.xml b/src/mapi/glapi/gen/ARB_map_buffer_range.xml
index afcb9b6ba6d..d8745044694 100644
--- a/src/mapi/glapi/gen/ARB_map_buffer_range.xml
+++ b/src/mapi/glapi/gen/ARB_map_buffer_range.xml
@@ -15,7 +15,7 @@
     <enum name="MAP_FLUSH_EXPLICIT_BIT"      value="0x0010"/>
     <enum name="MAP_UNSYNCHRONIZED_BIT"      value="0x0020"/>
 
-    <function name="MapBufferRange" offset="assign">
+    <function name="MapBufferRange" offset="assign" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="length" type="GLsizeiptr"/>
@@ -23,7 +23,7 @@
         <return type="GLvoid *"/>
     </function>
 
-    <function name="FlushMappedBufferRange" offset="assign">
+    <function name="FlushMappedBufferRange" offset="assign" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="offset" type="GLintptr"/>
         <param name="length" type="GLsizeiptr"/>
diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml
index 0d39db4d33f..9173dee5c73 100644
--- a/src/mapi/glapi/gen/ARB_sampler_objects.xml
+++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml
@@ -7,45 +7,45 @@
 
 <category name="GL_ARB_sampler_objects" number="81">
 
-    <function name="GenSamplers" offset="assign">
+    <function name="GenSamplers" offset="assign" es2="3.0">
       <param name="count" type="GLsizei"/>
       <param name="samplers" type="GLuint *"/>
     </function>
 
-    <function name="DeleteSamplers" offset="assign">
+    <function name="DeleteSamplers" offset="assign" es2="3.0">
       <param name="count" type="GLsizei"/>
       <param name="samplers" type="const GLuint *"/>
     </function>
 
-    <function name="IsSampler" offset="assign">
+    <function name="IsSampler" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <return type="GLboolean"/>
     </function>
 
-    <function name="BindSampler" offset="assign">
+    <function name="BindSampler" offset="assign" es2="3.0">
       <param name="unit" type="GLuint"/>
       <param name="sampler" type="GLuint"/>
     </function>
 
-    <function name="SamplerParameteri" offset="assign">
+    <function name="SamplerParameteri" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLint"/>
     </function>
 
-    <function name="SamplerParameterf" offset="assign">
+    <function name="SamplerParameterf" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="param" type="GLfloat"/>
     </function>
 
-    <function name="SamplerParameteriv" offset="assign">
+    <function name="SamplerParameteriv" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="const GLint *"/>
     </function>
 
-    <function name="SamplerParameterfv" offset="assign">
+    <function name="SamplerParameterfv" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="const GLfloat *"/>
@@ -63,13 +63,13 @@
       <param name="params" type="const GLuint *"/>
     </function>
 
-    <function name="GetSamplerParameteriv" offset="assign">
+    <function name="GetSamplerParameteriv" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="GLint *"/>
     </function>
 
-    <function name="GetSamplerParameterfv" offset="assign">
+    <function name="GetSamplerParameterfv" offset="assign" es2="3.0">
       <param name="sampler" type="GLuint"/>
       <param name="pname" type="GLenum"/>
       <param name="params" type="GLfloat *"/>
diff --git a/src/mapi/glapi/gen/ARB_sync.xml b/src/mapi/glapi/gen/ARB_sync.xml
index 4e4eebac32a..58f1639c421 100644
--- a/src/mapi/glapi/gen/ARB_sync.xml
+++ b/src/mapi/glapi/gen/ARB_sync.xml
@@ -39,40 +39,40 @@
     -->
 
 
-    <function name="FenceSync" offset="assign">
+    <function name="FenceSync" offset="assign" es2="3.0">
         <param name="condition" type="GLenum"/>
         <param name="flags" type="GLbitfield"/>
         <return type="GLsync"/>
     </function>
 
-    <function name="IsSync" offset="assign">
+    <function name="IsSync" offset="assign" es2="3.0">
         <param name="sync" type="GLsync"/>
 	<return type="GLboolean"/>
     </function>
 
-    <function name="DeleteSync" offset="assign">
+    <function name="DeleteSync" offset="assign" es2="3.0">
         <param name="sync" type="GLsync"/>
     </function>
 
-    <function name="ClientWaitSync" offset="assign">
+    <function name="ClientWaitSync" offset="assign" es2="3.0">
         <param name="sync" type="GLsync"/>
         <param name="flags" type="GLbitfield"/>
 	<param name="timeout" type="GLuint64"/>
         <return type="GLenum"/>
     </function>
 
-    <function name="WaitSync" offset="assign">
+    <function name="WaitSync" offset="assign" es2="3.0">
         <param name="sync" type="GLsync"/>
         <param name="flags" type="GLbitfield"/>
 	<param name="timeout" type="GLuint64"/>
     </function>
 
-    <function name="GetInteger64v" offset="assign">
+    <function name="GetInteger64v" offset="assign" es2="3.0">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint64 *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetSynciv" offset="assign">
+    <function name="GetSynciv" offset="assign" es2="3.0">
         <param name="sync" type="GLsync"/>
         <param name="pname" type="GLenum"/>
         <param name="bufSize" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/ARB_texture_storage.xml b/src/mapi/glapi/gen/ARB_texture_storage.xml
index 0459138064f..1d63e7ce3a4 100644
--- a/src/mapi/glapi/gen/ARB_texture_storage.xml
+++ b/src/mapi/glapi/gen/ARB_texture_storage.xml
@@ -17,7 +17,7 @@
     <param name="width" type="GLsizei"/>
   </function>
 
-  <function name="TexStorage2D" offset="assign">
+  <function name="TexStorage2D" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="levels" type="GLsizei"/>
     <param name="internalFormat" type="GLenum"/>
@@ -25,7 +25,7 @@
     <param name="height" type="GLsizei"/>
   </function>
 
-  <function name="TexStorage3D" offset="assign">
+  <function name="TexStorage3D" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="levels" type="GLsizei"/>
     <param name="internalFormat" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
index 80541a8217e..11aacb03309 100644
--- a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
@@ -39,14 +39,14 @@
 <enum name="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" value="0x8A46" />
 <enum name="INVALID_INDEX" value="0xFFFFFFFF" />
 
-<function name="GetUniformIndices" offset="assign">
+<function name="GetUniformIndices" offset="assign" es2="3.0">
     <param name="program" type="GLuint" />
     <param name="uniformCount" type="GLsizei" />
     <param name="uniformNames" type="const GLchar * const *" />
     <param name="uniformIndices" type="GLuint *" />
 </function>
 
-<function name="GetActiveUniformsiv" offset="assign">
+<function name="GetActiveUniformsiv" offset="assign" es2="3.0">
     <param name="program" type="GLuint" />
     <param name="uniformCount" type="GLsizei" />
     <param name="uniformIndices" type="const GLuint *" />
@@ -62,20 +62,20 @@
     <param name="uniformName" type="GLchar *" />
 </function>
 
-<function name="GetUniformBlockIndex" offset="assign">
+<function name="GetUniformBlockIndex" offset="assign" es2="3.0">
     <return type="GLuint"/>
     <param name="program" type="GLuint" />
     <param name="uniformBlockName" type="const GLchar *" />
 </function>
 
-<function name="GetActiveUniformBlockiv" offset="assign">
+<function name="GetActiveUniformBlockiv" offset="assign" es2="3.0">
     <param name="program" type="GLuint" />
     <param name="uniformBlockIndex" type="GLuint" />
     <param name="pname" type="GLenum" />
     <param name="params" type="GLint *" />
 </function>
 
-<function name="GetActiveUniformBlockName" offset="assign">
+<function name="GetActiveUniformBlockName" offset="assign" es2="3.0">
     <param name="program" type="GLuint" />
     <param name="uniformBlockIndex" type="GLuint" />
     <param name="bufSize" type="GLsizei" />
@@ -86,7 +86,7 @@
 <!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase,
      GetIntegeri_v -->
 
-<function name="UniformBlockBinding" offset="assign" >
+<function name="UniformBlockBinding" offset="assign" es2="3.0">
     <param name="program" type="GLuint" />
     <param name="uniformBlockIndex" type="GLuint" />
     <param name="uniformBlockBinding" type="GLuint" />
diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mapi/glapi/gen/ARB_vertex_array_object.xml
index 3b4ab64f557..872548d1aa0 100644
--- a/src/mapi/glapi/gen/ARB_vertex_array_object.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_array_object.xml
@@ -10,21 +10,21 @@
 
     <enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/>
 
-    <function name="BindVertexArray" offset="assign">
+    <function name="BindVertexArray" offset="assign" es2="3.0">
         <param name="array" type="GLuint"/>
     </function>
 
-    <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE">
+    <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="const GLuint *"/>
     </function>
 
-    <function name="GenVertexArrays" offset="assign">
+    <function name="GenVertexArrays" offset="assign" es2="3.0">
         <param name="n" type="GLsizei"/>
         <param name="arrays" type="GLuint *"/>
     </function>
 
-    <function name="IsVertexArray" alias="IsVertexArrayAPPLE">
+    <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0">
         <param name="array" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index 051f1e0cc92..dbd7513c7dd 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -82,30 +82,30 @@
   <enum name="TRANSFORM_FEEDBACK_BUFFER_ACTIVE"    value="0x8E24"/>
   <enum name="TRANSFORM_FEEDBACK_BINDING"          value="0x8E25"/>
 
-  <function name="BindTransformFeedback" offset="assign">
+  <function name="BindTransformFeedback" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="id" type="GLuint"/>
   </function>
 
-  <function name="DeleteTransformFeedbacks" offset="assign">
+  <function name="DeleteTransformFeedbacks" offset="assign" es2="3.0">
     <param name="n" type="GLsizei"/>
     <param name="ids" type="const GLuint *"/>
   </function>
 
-  <function name="GenTransformFeedbacks" offset="assign">
+  <function name="GenTransformFeedbacks" offset="assign" es2="3.0">
     <param name="n" type="GLsizei"/>
     <param name="ids" type="GLuint *"/>
   </function>
 
-  <function name="IsTransformFeedback" offset="assign">
+  <function name="IsTransformFeedback" offset="assign" es2="3.0">
     <param name="id" type="GLuint"/>
     <return type="GLboolean"/>
   </function>
 
-  <function name="PauseTransformFeedback" offset="assign">
+  <function name="PauseTransformFeedback" offset="assign" es2="3.0">
   </function>
 
-  <function name="ResumeTransformFeedback" offset="assign">
+  <function name="ResumeTransformFeedback" offset="assign" es2="3.0">
   </function>
 
   <function name="DrawTransformFeedback" offset="assign">
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index d287ac2b0f4..7642a27c4e6 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -119,32 +119,32 @@
 
   <!-- These functions are unique to GL3 -->
 
-  <function name="ClearBufferiv" offset="assign">
+  <function name="ClearBufferiv" offset="assign" es2="3.0">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
     <param name="value" type="const GLint *"/>
   </function>
 
-  <function name="ClearBufferuiv" offset="assign">
+  <function name="ClearBufferuiv" offset="assign" es2="3.0">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="ClearBufferfv" offset="assign">
+  <function name="ClearBufferfv" offset="assign" es2="3.0">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
     <param name="value" type="const GLfloat *"/>
   </function>
 
-  <function name="ClearBufferfi" offset="assign">
+  <function name="ClearBufferfi" offset="assign" es2="3.0">
     <param name="buffer" type="GLenum"/>
     <param name="drawbuffer" type="GLint"/>
     <param name="depth" type="GLfloat"/>
     <param name="stencil" type="GLint"/>
   </function>
 
-  <function name="GetStringi" offset="assign">
+  <function name="GetStringi" offset="assign" es2="3.0">
     <param name="name" type="GLenum"/>
     <param name="index" type="GLuint"/>
       <return type="const GLubyte *"/>
@@ -171,7 +171,7 @@
     <param name="data" type="GLboolean *"/>
   </function>
 
-  <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT">
+  <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0">
     <param name="value" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLint *"/>
@@ -195,7 +195,7 @@
 
   <!-- These functions alias ones form GL_EXT_transform_feedback -->
 
-  <function name="GetFragDataLocation" alias="GetFragDataLocationEXT">
+  <function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0">
     <param name="program" type="GLuint"/>
     <param name="name" type="const GLchar *"/>
       <return type="GLint"/>
@@ -207,14 +207,14 @@
     <param name="name" type="const GLchar *"/>
   </function>
 
-  <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT">
+  <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0">
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT">
+  <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0">
   </function>
 
-  <function name="BindBufferRange" alias="BindBufferRangeEXT">
+  <function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
@@ -222,20 +222,20 @@
     <param name="size" type="GLsizeiptr"/>
   </function>
 
-  <function name="BindBufferBase" alias="BindBufferBaseEXT">
+  <function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="buffer" type="GLuint"/>
   </function>
 
-  <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT">
+  <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0">
     <param name="program" type="GLuint"/>
     <param name="count" type="GLsizei"/>
     <param name="varyings" type="const GLchar * const *"/>
     <param name="bufferMode" type="GLenum"/>
   </function>
 
-  <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT">
+  <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0">
     <param name="program" type="GLuint"/>
     <param name="index" type="GLuint"/>
     <param name="bufSize" type="GLsizei"/>
@@ -257,7 +257,7 @@
 
   <!-- These functions alias ones from GL_EXT_gpu_shader4 -->
 
-  <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT">
+  <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="size" type="GLint"/>
     <param name="type" type="GLenum"/>
@@ -265,13 +265,13 @@
     <param name="pointer" type="const GLvoid *"/>
   </function>
 
-  <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT">
+  <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLint *"/>
   </function>
 
-  <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT">
+  <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLuint *"/>
@@ -295,7 +295,7 @@
     <param name="z" type="GLint"/>
   </function>
 
-  <function name="VertexAttribI4i" alias="VertexAttribI4iEXT">
+  <function name="VertexAttribI4i" alias="VertexAttribI4iEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="x" type="GLint"/>
     <param name="y" type="GLint"/>
@@ -321,7 +321,7 @@
     <param name="z" type="GLuint"/>
   </function>
 
-  <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT">
+  <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
@@ -344,7 +344,7 @@
     <param name="v" type="const GLint *"/>
   </function>
 
-  <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT">
+  <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLint *"/>
   </function>
@@ -364,7 +364,7 @@
     <param name="v" type="const GLuint *"/>
   </function>
 
-  <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT">
+  <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLuint *"/>
   </function>
@@ -389,31 +389,31 @@
     <param name="v" type="const GLushort *"/>
   </function>
 
-  <function name="GetUniformuiv" alias="GetUniformuivEXT">
+  <function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0">
     <param name="program" type="GLuint"/>
     <param name="location" type="GLint"/>
     <param name="params" type="GLuint *"/>
   </function>
 
-  <function name="Uniform1ui" alias="Uniform1uiEXT">
+  <function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
   </function>
 
-  <function name="Uniform2ui" alias="Uniform2uiEXT">
+  <function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
   </function>
 
-  <function name="Uniform3ui" alias="Uniform3uiEXT">
+  <function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
     <param name="z" type="GLuint"/>
   </function>
 
-  <function name="Uniform4ui" alias="Uniform4uiEXT">
+  <function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="x" type="GLuint"/>
     <param name="y" type="GLuint"/>
@@ -421,25 +421,25 @@
     <param name="w" type="GLuint"/>
   </function>
 
-  <function name="Uniform1uiv" alias="Uniform1uivEXT">
+  <function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform2uiv" alias="Uniform2uivEXT">
+  <function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform3uiv" alias="Uniform3uivEXT">
+  <function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
   </function>
 
-  <function name="Uniform4uiv" alias="Uniform4uivEXT">
+  <function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0">
     <param name="location" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="value" type="const GLuint *"/>
@@ -541,14 +541,14 @@
   <enum name="PRIMITIVE_RESTART"              value="0x8F9D"/>
   <enum name="PRIMITIVE_RESTART_INDEX"        value="0x8F9E"/>
 
-  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB">
+  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB" es2="3.0">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB">
+  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB" es2="3.0">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>
@@ -594,13 +594,13 @@
   <enum name="MAX_FRAGMENT_INPUT_COMPONENTS"        value="0x9125"/>
   <enum name="CONTEXT_PROFILE_MASK"                 value="0x9126"/>
 
-  <function name="GetInteger64i_v" offset="assign">
+  <function name="GetInteger64i_v" offset="assign" es2="3.0">
     <param name="cap" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLint64 *"/>
   </function>
 
-  <function name="GetBufferParameteri64v" offset="assign">
+  <function name="GetBufferParameteri64v" offset="assign" es2="3.0">
     <param name="target" type="GLenum"/>
     <param name="pname" type="GLenum"/>
     <param name="params" type="GLint64 *"/>
@@ -624,7 +624,7 @@
   <enum name="TEXTURE_SWIZZLE_A"                value="0x8E45"/>
   <enum name="TEXTURE_SWIZZLE_RGBA"             value="0x8E46"/>
 
-  <function name="VertexAttribDivisor" offset="assign">
+  <function name="VertexAttribDivisor" offset="assign" es2="3.0">
     <param name="index" type="GLuint"/>
     <param name="divisor" type="GLuint"/>
   </function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 10135018725..a46d6131c14 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2603,7 +2603,7 @@
         <glx rop="170" large="true"/>
     </function>
 
-    <function name="ReadBuffer" offset="254">
+    <function name="ReadBuffer" offset="254" es2="3.0">
         <param name="mode" type="GLenum"/>
         <glx rop="171"/>
     </function>
@@ -3708,7 +3708,7 @@
         <glx rop="4097"/>
     </function>
 
-    <function name="DrawRangeElements" offset="338">
+    <function name="DrawRangeElements" offset="338" es2="3.0">
         <param name="mode" type="GLenum"/>
         <param name="start" type="GLuint"/>
         <param name="end" type="GLuint"/>
@@ -3975,7 +3975,7 @@
         <glx rop="4113"/>
     </function>
 
-    <function name="TexImage3D" offset="371">
+    <function name="TexImage3D" offset="371" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -3989,7 +3989,7 @@
         <glx rop="4114" large="true"/>
     </function>
 
-    <function name="TexSubImage3D" offset="372">
+    <function name="TexSubImage3D" offset="372" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4005,7 +4005,7 @@
         <glx rop="4115" large="true"/>
     </function>
 
-    <function name="CopyTexSubImage3D" offset="373">
+    <function name="CopyTexSubImage3D" offset="373" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4448,7 +4448,7 @@
         <param name="invert" type="GLboolean"/>
     </function>
 
-    <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB">
+    <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4482,7 +4482,7 @@
         <param name="data" type="const GLvoid *"/>
     </function>
 
-    <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB">
+    <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4972,7 +4972,7 @@
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetBufferPointerv" alias="GetBufferPointervARB">
+    <function name="GetBufferPointerv" alias="GetBufferPointervARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **" output="true"/>
@@ -4996,36 +4996,36 @@
         <return type="GLvoid *"/>
     </function>
 
-    <function name="UnmapBuffer" alias="UnmapBufferARB">
+    <function name="UnmapBuffer" alias="UnmapBufferARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <return type="GLboolean"/>
     </function>
 
-    <function name="GenQueries" alias="GenQueriesARB">
+    <function name="GenQueries" alias="GenQueriesARB" es2="3.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="ids" type="GLuint *" output="true" count="n"/>
     </function>
 
-    <function name="DeleteQueries" alias="DeleteQueriesARB">
+    <function name="DeleteQueries" alias="DeleteQueriesARB" es2="3.0">
         <param name="n" type="GLsizei"/>
         <param name="ids" type="const GLuint *"/>
     </function>
 
-    <function name="IsQuery" alias="IsQueryARB">
+    <function name="IsQuery" alias="IsQueryARB" es2="3.0">
         <param name="id" type="GLuint"/>
         <return type="GLboolean"/>
     </function>
 
-    <function name="BeginQuery" alias="BeginQueryARB">
+    <function name="BeginQuery" alias="BeginQueryARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="id" type="GLuint"/>
     </function>
 
-    <function name="EndQuery" alias="EndQueryARB">
+    <function name="EndQuery" alias="EndQueryARB" es2="3.0">
         <param name="target" type="GLenum"/>
     </function>
 
-    <function name="GetQueryiv" alias="GetQueryivARB">
+    <function name="GetQueryiv" alias="GetQueryivARB" es2="3.0">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
@@ -5037,7 +5037,7 @@
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
     </function>
 
-    <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB">
+    <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB" es2="3.0">
         <param name="id" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLuint *" output="true" variable_param="pname"/>
@@ -5145,7 +5145,7 @@
         <param name="modeA" type="GLenum"/>
     </function>
 
-    <function name="DrawBuffers" alias="DrawBuffersARB">
+    <function name="DrawBuffers" alias="DrawBuffersARB" es2="3.0">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="bufs" type="const GLenum *" count="n"/>
     </function>
@@ -5727,42 +5727,42 @@
     <enum name="COMPRESSED_SLUMINANCE"          value="0x8C4A"/>
     <enum name="COMPRESSED_SLUMINANCE_ALPHA"    value="0x8C4B"/>
 
-    <function name="UniformMatrix2x3fv" offset="assign">
+    <function name="UniformMatrix2x3fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3x2fv" offset="assign">
+    <function name="UniformMatrix3x2fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix2x4fv" offset="assign">
+    <function name="UniformMatrix2x4fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4x2fv" offset="assign">
+    <function name="UniformMatrix4x2fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix3x4fv" offset="assign">
+    <function name="UniformMatrix3x4fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>
         <param name="value" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
-    <function name="UniformMatrix4x3fv" offset="assign">
+    <function name="UniformMatrix4x3fv" offset="assign" es2="3.0">
         <param name="location" type="GLint"/>
         <param name="count" type="GLsizei"/>
         <param name="transpose" type="GLboolean"/>