From 9b5be9300b35760d79dfe10ad070682b31ae7ba0 Mon Sep 17 00:00:00 2001
From: Stefanos A <stapostol@gmail.com>
Date: Mon, 4 Nov 2013 00:04:09 +0100
Subject: [PATCH] Strongly-typed enums for ES 3.0 (WIP2)

Added strongly-typed enums for sections: Vertices, Shaders and
Programs. Added a number of missing enums for ES 2.0. Normalized
several APIs between OpenGL and OpenGL ES.
---
 Source/Bind/Specifications/GL2/overrides.xml  | 345 ++++++++-
 Source/OpenTK/Graphics/ES20/ES20.cs           | 132 ++--
 Source/OpenTK/Graphics/ES20/ES20Core.cs       |  22 +-
 Source/OpenTK/Graphics/ES20/ES20Delegates.cs  |  22 +-
 Source/OpenTK/Graphics/ES20/ES20Enums.cs      |  92 ++-
 Source/OpenTK/Graphics/ES30/ES30.cs           | 136 ++--
 Source/OpenTK/Graphics/ES30/ES30Delegates.cs  |  16 +-
 Source/OpenTK/Graphics/ES30/ES30Enums.cs      | 658 +++++++++++++++---
 Source/OpenTK/Graphics/ES30/ES3Core.cs        |  16 +-
 Source/OpenTK/Graphics/OpenGL/GL.cs           |  36 +-
 Source/OpenTK/Graphics/OpenGL/GLCore.cs       |   6 +-
 Source/OpenTK/Graphics/OpenGL/GLDelegates.cs  |   6 +-
 Source/OpenTK/Graphics/OpenGL/GLEnums.cs      | 168 ++++-
 Source/OpenTK/Graphics/OpenGL4/GL4.cs         |  36 +-
 Source/OpenTK/Graphics/OpenGL4/GL4Core.cs     |   6 +-
 .../OpenTK/Graphics/OpenGL4/GL4Delegates.cs   |   6 +-
 Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs    | 168 ++++-
 17 files changed, 1532 insertions(+), 339 deletions(-)

diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 2190d0e0..8837ad13 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -298,7 +298,7 @@
 
     <function name="BeginTransformFeedback" extension="Core">
       <param name="primitiveMode">
-        <type>BeginFeedbackMode</type>
+        <type>TransformFeedbackPrimitiveType</type>
       </param>
     </function>
 
@@ -334,7 +334,7 @@
 
     <function name="GetTransformFeedbackVarying" extension="Core">
       <param name="type">
-        <type>ActiveAttribType</type>
+        <type>TransformFeedbackType</type>
       </param>
     </function>
 
@@ -871,7 +871,7 @@
         <type>ShaderType</type>
       </param>
       <param name="precisiontype">
-        <type>ShaderPrecisionType</type>
+        <type>ShaderPrecision</type>
       </param>
     </function>
 
@@ -3618,7 +3618,7 @@
       <token name="SHADER_SOURCE_LENGTH" value="0x8B88" />
       <token name="SHADER_TYPE" value="0x8B4F" />
     </enum>
-    <enum name="ShaderPrecisionType">
+    <enum name="ShaderPrecision">
       <use enum="VERSION_4_1" token="LOW_FLOAT" />
       <use enum="VERSION_4_1" token="MEDIUM_FLOAT" />
       <use enum="VERSION_4_1" token="HIGH_FLOAT" />
@@ -3948,9 +3948,50 @@
       <token name="INTERLEAVED_ATTRIBS" value="0x8C8C" />
       <token name="SEPARATE_ATTRIBS" value="0x8C8D" />
     </enum>
+    <enum name="TransformFeedbackPrimitiveType">
+      <use enum="PrimitiveType" token="POINTS" />
+      <use enum="PrimitiveType" token="LINES" />
+      <use enum="PrimitiveType" token="TRIANGLES" />
+    </enum>
     <enum name="TransformFeedbackTarget">
       <use enum="VERSION_4_0" token="TRANSFORM_FEEDBACK" />
     </enum>
+    <enum name="TransformFeedbackType">
+      <use token="FLOAT" />
+      <use token="FLOAT_VEC2" />
+      <use token="FLOAT_VEC3" />
+      <use token="FLOAT_VEC4" />
+      <use token="FLOAT_MAT2" />
+      <use token="FLOAT_MAT3" />
+      <use token="FLOAT_MAT4" />
+      <use token="FLOAT_MAT2x3" />
+      <use token="FLOAT_MAT2x4" />
+      <use token="FLOAT_MAT3x2" />
+      <use token="FLOAT_MAT3x4" />
+      <use token="FLOAT_MAT4x2" />
+      <use token="FLOAT_MAT4x3" />
+      <use token="INT" />
+      <use token="INT_VEC2" />
+      <use token="INT_VEC3" />
+      <use token="INT_VEC4" />
+      <use token="UNSIGNED_INT" />
+      <use token="UNSIGNED_INT_VEC2" />
+      <use token="UNSIGNED_INT_VEC3" />
+      <use token="UNSIGNED_INT_VEC4" />
+      <use token="DOUBLE" />
+      <use token="DOUBLE_VEC2" />
+      <use token="DOUBLE_VEC3" />
+      <use token="DOUBLE_VEC4" />
+      <use token="DOUBLE_MAT2" />
+      <use token="DOUBLE_MAT3" />
+      <use token="DOUBLE_MAT4" />
+      <use token="DOUBLE_MAT2x3" />
+      <use token="DOUBLE_MAT2x4" />
+      <use token="DOUBLE_MAT3x2" />
+      <use token="DOUBLE_MAT3x4" />
+      <use token="DOUBLE_MAT4x2" />
+      <use token="DOUBLE_MAT4x3" />
+    </enum>
     <enum name="VertexAttribDoubleType">
       <use enum="VERSION_4_1" token="DOUBLE" />
     </enum>
@@ -4422,6 +4463,16 @@
       <token name="OneMinusConstantAlpha" value="0X8004" />
       <token name="SrcAlphaSaturate" value="0X0308" remark="only valid for source RGB/Alpha" />
     </enum>
+    
+    <enum name="BlitFramebufferFilter">
+      <use token="LINEAR" />
+      <use token="NEAREST" />
+    </enum>
+    
+    <!-- OES_mapbuffer -->
+    <enum name="BufferPointer">
+      <use token="BUFFER_MAP_POINTER" />
+    </enum>
 
     <enum name="BufferTarget">
       <token name="ArrayBuffer" value="0X8892" />
@@ -4496,6 +4547,15 @@
       <use token="DEBUG_TYPE_PUSH_GROUP" />
       <use token="DEBUG_TYPE_POP_GROUP" />
     </enum>
+    
+    <!-- EXT_disjoint_timer_query -->
+    <enum name="GetQueryObjectParam">
+      <use token="CURRENT_RESULT" />
+      <use token="CURRENT_RESULT_AVAILABLE" />
+    </enum>
+    <enum name="GetQueryParam">
+      <use token="CURRENT_QUERY" />
+    </enum>
      
     <enum name="VertexAttribPointerType">
       <token name="Byte" value="0X1400" />
@@ -4614,8 +4674,26 @@
       <token name="OutOfMemory" value="0X0505" />
       <token name="InvalidFramebufferOperation " value="0X0506" />
     </enum>
-     
+    
     <enum name="ProgramParameter">
+      <use token="DELETE_STATUS" />
+      <use token="LINK_STATUS" />
+      <use token="VALIDATE_STATUS" />
+      <use token="INFO_LOG_LENGTH" />
+      <use token="ATTACHED_SHADERS" />
+      <use token="ACTIVE_ATTRIBUTES" />
+      <use token="ACTIVE_ATTRIBUTE_MAX_LENGTH" />
+      <use token="ACTIVE_UNIFORMS" />
+      <use token="ACTIVE_UNIFORM_MAX_LENGTH" />
+      <use token="ACTIVE_UNIFORM_BLOCKS" />
+      <use token="ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" />
+      <use token="TRANSFORM_FEEDBACK_BUFFER_MODE" />
+      <use token="TRANSFORM_FEEDBACK_VARYINGS" />
+      <use token="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH" />
+      <use token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
+    </enum>
+     
+    <enum name="ProgramParameterName">
       <token name="DeleteStatus" value="0X8b80" />
       <token name="LinkStatus" value="0X8b82" />
       <token name="ValidateStatus" value="0X8b83" />
@@ -4802,6 +4880,11 @@
       <token name="FramebufferIncompleteDimensions" value="0X8cd9" />
       <token name="FramebufferUnsupported" value="0X8cdd" />
     </enum>
+    
+    <enum name="QueryTarget">
+      <use token="ANY_SAMPLES_PASSED" />
+      <use token="ANY_SAMPLES_PASSED_CONSERVATIVE" />
+    </enum>
 
     <enum name="RenderbufferTarget">
       <token name="Renderbuffer" value="0X8d41" />
@@ -5008,7 +5091,7 @@
       <param name="target"><type>TransformFeedbackTarget</type></param>
     </function>
     <function name="BeginTransformFeedback">
-      <param name="primitiveMode"><type>BeginFeedbackMode</type></param>
+      <param name="primitiveMode"><type>TransformFeedbackPrimitiveType</type></param>
     </function>
     
     <!-- Reading and Copying Pixels [4.3.1-2] -->
@@ -5031,13 +5114,141 @@
     <function name="CullFace">
       <param name="face"><type>CullFaceMode</type></param>
     </function>
+    
+    <!-- Vertex Arrays [2.8] -->
+    <function name="VertexAttribIPointer">
+      <param name="type"><type>VertexAttribIntegerType</type></param>
+    </function>
+    
+    <!-- Program Objects [2.11.3-4] -->
+    <function name="ProgramParameter">
+      <param name="pname"><type>ProgramParameterName</type></param>
+    </function>
+    
+    <!-- Uniform Variables [2.11.6] -->
+    <function name="GetActiveUniform">
+      <param name="type"><type>ActiveUniformType</type></param>
+    </function>
+    <function name="GetActiveUniforms">
+      <param name="pname"><type>ActiveUniformParameter</type></param>
+    </function>
+    <function name="GetActiveUniformBlock">
+      <param name="pname"><type>ActiveUniformBlockParameter</type></param>
+    </function>
+    
+    <!-- Output Variables [2.11.8] -->
+    <function name="GetTransformFeedbackVarying">
+      <param name="type"><type>TransformFeedbackType</type></param>
+    </function>
+    <function name="TransformFeedbackVaryings">
+      <param name="bufferMode"><type>TransformFeedbackMode</type></param>
+    </function>
+
+	<!-- Shader Queries [6.1.12] -->
+    <function name="GetShader">
+      <param name="pname"><type>ShaderParameter</type></param> 
+    </function>
+    <function name="GetShaderPrecisionFormat">
+      <param name="shadertype"><type>ShaderType</type></param>
+      <param name="precisiontype"><type>ShaderPrecision</type></param>
+    </function>
+    <function name="GetVertexAttrib">
+      <param name="pname"><type>VertexAttribParameter</type></param> 
+    </function>
+    <function name="GetVertexAttribPointer">
+      <param name="pname"><type>VertexAttribPointerParameter</type></param> 
+    </function>
+    
+    <!-- Program Queries [6.1.12] -->
+    <function name="GetProgram" extension="Core" version="2.0">
+      <param name="pname"><type>ProgramParameter</type></param>
+    </function>
+    
    </replace>
   
   <add name="gles2" version="3.0">
-    <enum name="BeginFeedbackMode">
-      <use token="TRIANGLES" />
-      <use token="LINES" />
-      <use token="POINTS" />
+    <enum name="ActiveAttribType">
+      <use token="FLOAT" />
+      <use token="FLOAT_VEC2" />
+      <use token="FLOAT_VEC3" />
+      <use token="FLOAT_VEC4" />
+      <use token="FLOAT_MAT2" />
+      <use token="FLOAT_MAT3" />
+      <use token="FLOAT_MAT4" />
+      <use token="FLOAT_MAT2x3" />
+      <use token="FLOAT_MAT2x4" />
+      <use token="FLOAT_MAT3x2" />
+      <use token="FLOAT_MAT3x4" />
+      <use token="FLOAT_MAT4x2" />
+      <use token="FLOAT_MAT4x3" />
+      <use token="INT" />
+      <use token="INT_VEC2" />
+      <use token="INT_VEC3" />
+      <use token="INT_VEC4" />
+      <use token="UNSIGNED_INT" />
+      <use token="UNSIGNED_INT_VEC2" />
+      <use token="UNSIGNED_INT_VEC3" />
+      <use token="UNSIGNED_INT_VEC4" />
+    </enum>
+    <enum name="ActiveUniformBlockParameter">
+      <use token="UNIFORM_BLOCK_BINDING" />
+      <use token="UNIFORM_BLOCK_DATA_SIZE" />
+      <use token="UNIFORM_BLOCK_NAME_LENGTH" />
+      <use token="UNIFORM_BLOCK_ACTIVE_UNIFORMS" />
+      <use token="UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES" />
+      <use token="UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER" />
+      <use token="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" />
+    </enum>
+    <enum name="ActiveUniformParameter">
+      <use token="UNIFORM_TYPE" />
+      <use token="UNIFORM_SIZE" />
+      <use token="UNIFORM_NAME_LENGTH" />
+      <use token="UNIFORM_BLOCK_INDEX" />
+      <use token="UNIFORM_OFFSET" />
+      <use token="UNIFORM_ARRAY_STRIDE" />
+      <use token="UNIFORM_MATRIX_STRIDE" />
+      <use token="UNIFORM_IS_ROW_MAJOR" />
+    </enum>
+    <enum name="ActiveUniformType">
+      <use token="BOOL" />
+      <use token="BOOL_VEC2" />
+      <use token="BOOL_VEC3" />
+      <use token="BOOL_VEC4" />
+      <use token="FLOAT" />
+      <use token="FLOAT_VEC2" />
+      <use token="FLOAT_VEC3" />
+      <use token="FLOAT_VEC4" />
+      <use token="INT" />
+      <use token="INT_VEC2" />
+      <use token="INT_VEC3" />
+      <use token="INT_VEC4" />
+      <use token="UNSIGNED_INT" />
+      <use token="UNSIGNED_INT_VEC2" />
+      <use token="UNSIGNED_INT_VEC3" />
+      <use token="UNSIGNED_INT_VEC4" />
+      <use token="FLOAT_MAT2" />
+      <use token="FLOAT_MAT3" />
+      <use token="FLOAT_MAT4" />
+      <use token="FLOAT_MAT2x3" />
+      <use token="FLOAT_MAT2x4" />
+      <use token="FLOAT_MAT3x4" />
+      <use token="FLOAT_MAT4x2" />
+      <use token="FLOAT_MAT4x3" />
+      <use token="SAMPLER_2D" />
+      <use token="SAMPLER_2D_ARRAY" />
+      <use token="SAMPLER_3D" />
+      <use token="SAMPLER_CUBE" />
+      <use token="SAMPLER_2D_SHADOW" />
+      <use token="SAMPLER_2D_ARRAY_SHADOW" />
+      <use token="SAMPLER_CUBE_SHADOW" />
+      <use token="INT_SAMPLER_2D" />
+      <use token="INT_SAMPLER_3D" />
+      <use token="INT_SAMPLER_CUBE" />
+      <use token="INT_SAMPLER_2D_ARRAY" />
+      <use token="UNSIGNED_INT_SAMPLER_2D" />
+      <use token="UNSIGNED_INT_SAMPLER_3D" />
+      <use token="UNSIGNED_INT_SAMPLER_CUBE" />
+      <use token="UNSIGNED_INT_SAMPLER_2D_ARRAY" />
     </enum>
     <enum name="BlitFramebufferFilter">
       <use token="LINEAR" />
@@ -5099,9 +5310,15 @@
       <use token="BACK" />
       <use token="FRONT_AND_BACK" />
     </enum>
+    <enum name="DrawElementsType">
+      <use token="UNSIGNED_BYTE" />
+      <use token="UNSIGNED_SHORT" />
+      <use token="UNSIGNED_INT" />
+    </enum>
     <enum name="EnableCap">
-      <use token="CULL_FACE" />
-      <use token="POLYGON_OFFSET_FILL" />
+      <use token="CULL_FACE" /> <!-- Polygons [3.6] -->
+      <use token="POLYGON_OFFSET_FILL" />  <!-- Polygons [3.6] -->
+      <use token="PRIMITIVE_RESTART_FIXED_INDEX" /> <!-- Vertex Arrays [2.8] -->
     </enum>
     <enum name="FrontFaceDirection">
       <use token="CCW" />
@@ -5124,6 +5341,23 @@
       <use token="UNSIGNED_BYTE" />
       <use token="UNSIGNED_INT" />
     </enum>
+    <enum name="ProgramParameter">
+      <use token="DELETE_STATUS" />
+      <use token="LINK_STATUS" />
+      <use token="VALIDATE_STATUS" />
+      <use token="INFO_LOG_LENGTH" />
+      <use token="ATTACHED_SHADERS" />
+      <use token="ACTIVE_ATTRIBUTES" />
+      <use token="ACTIVE_ATTRIBUTE_MAX_LENGTH" />
+      <use token="ACTIVE_UNIFORMS" />
+      <use token="ACTIVE_UNIFORM_MAX_LENGTH" />
+      <use token="ACTIVE_UNIFORM_BLOCKS" />
+      <use token="ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" />
+      <use token="TRANSFORM_FEEDBACK_BUFFER_MODE" />
+      <use token="TRANSFORM_FEEDBACK_VARYINGS" />
+      <use token="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH" />
+      <use token="PROGRAM_BINARY_RETRIEVABLE_HINT" />
+    </enum>
     <enum name="QueryTarget">
       <use token="ANY_SAMPLES_PASSED" />
       <use token="ANY_SAMPLES_PASSED_CONSERVATIVE" />
@@ -5149,9 +5383,96 @@
       <use token="COLOR_ATTACHMENT14" />
       <use token="COLOR_ATTACHMENT15" />
     </enum>
+    <enum name="ShaderParameter">
+      <use token="ShaderType" />
+      <use token="DeleteStatus" />
+      <use token="CompileStatus" />
+      <use token="InfoLogLength" />
+      <use token="ShaderSourceLength" />
+    </enum>
+    <enum name="ShaderPrecision">
+      <use token="LOW_FLOAT" />
+      <use token="MEDIUM_FLOAT" />
+      <use token="HIGH_FLOAT" />
+      <use token="LOW_INT" />
+      <use token="MEDIUM_INT" />
+      <use token="HIGH_INT" />
+    </enum>
+    <enum name="ShaderType">
+      <use token="VERTEX_SHADER" />
+      <use token="FRAGMENT_SHADER" />
+    </enum>
+    <enum name="TransformFeedbackMode">
+      <use token="INTERLEAVED_ATTRIBS" />
+      <use token="SEPARATE_ATTRIBS" />
+    </enum>
+    <enum name="TransformFeedbackPrimitiveType">
+      <use token="TRIANGLES" />
+      <use token="LINES" />
+      <use token="POINTS" />
+    </enum>
     <enum name="TransformFeedbackTarget">
       <use token="TRANSFORM_FEEDBACK" />
     </enum>
+    <enum name="TransformFeedbackType">
+      <use token="FLOAT" />
+      <use token="FLOAT_VEC2" />
+      <use token="FLOAT_VEC3" />
+      <use token="FLOAT_VEC4" />
+      <use token="FLOAT_MAT2" />
+      <use token="FLOAT_MAT3" />
+      <use token="FLOAT_MAT4" />
+      <use token="FLOAT_MAT2x3" />
+      <use token="FLOAT_MAT2x4" />
+      <use token="FLOAT_MAT3x2" />
+      <use token="FLOAT_MAT3x4" />
+      <use token="FLOAT_MAT4x2" />
+      <use token="FLOAT_MAT4x3" />
+      <use token="INT" />
+      <use token="INT_VEC2" />
+      <use token="INT_VEC3" />
+      <use token="INT_VEC4" />
+      <use token="UNSIGNED_INT" />
+      <use token="UNSIGNED_INT_VEC2" />
+      <use token="UNSIGNED_INT_VEC3" />
+      <use token="UNSIGNED_INT_VEC4" />
+    </enum>
+    <enum name="VertexAttribIntegerType">
+      <use token="BYTE" />
+      <use token="UNSIGNED_BYTE" />
+      <use token="SHORT" />
+      <use token="UNSIGNED_SHORT" />
+      <use token="INT" />
+      <use token="UNSIGNED_INT" />
+    </enum>
+    <enum name="VertexAttribParameter">
+      <use token="CURRENT_VERTEX_ATTRIB" />
+      <use token="VERTEX_ATTRIB_ARRAY_BUFFER_BINDING" />
+      <use token="VERTEX_ATTRIB_ARRAY_DIVISOR" />
+      <use token="VERTEX_ATTRIB_ARRAY_ENABLED" />
+      <use token="VERTEX_ATTRIB_ARRAY_INTEGER" />
+      <use token="VERTEX_ATTRIB_ARRAY_SIZE" />
+      <use token="VERTEX_ATTRIB_ARRAY_STRIDE" />
+      <use token="VERTEX_ATTRIB_ARRAY_TYPE" />
+      <use token="VERTEX_ATTRIB_ARRAY_NORMALIZED" />
+    </enum>
+    <enum name="VertexAttribPointerParameter">
+      <use token="VERTEX_ATTRIB_ARRAY_POINTER" />
+    </enum>
+    <enum name="VertexAttribPointerType">
+      <use token="BYTE" />
+      <use token="UNSIGNED_BYTE" />
+      <use token="SHORT" />
+      <use token="UNSIGNED_SHORT" />
+      <use token="INT" />
+      <use token="UNSIGNED_INT" />
+      <use token="FIXED" />
+      <use token="FLOAT" />
+      <use token="HALF_FLOAT" />
+	  <use token="INT_2_10_10_10_REV" />
+      <use token="UNSIGNED_INT_2_10_10_10_REV" />
+    </enum>
+
   </add>
 
 </signatures>
diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs
index 210f912b..de567769 100644
--- a/Source/OpenTK/Graphics/ES20/ES20.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20.cs
@@ -1267,13 +1267,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferANGLE")]
             public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (BlitFramebufferFilter)filter);
+                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
                 #if DEBUG
                 }
                 #endif
@@ -21573,13 +21573,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glBeginQueryEXT")]
             public static 
-            void BeginQuery(QueryTarget target, Int32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.QueryTarget target, Int32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((QueryTarget)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -21602,13 +21602,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glBeginQueryEXT")]
             public static 
-            void BeginQuery(QueryTarget target, UInt32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((QueryTarget)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -22655,13 +22655,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glEndQueryEXT")]
             public static 
-            void EndQuery(QueryTarget target)
+            void EndQuery(OpenTK.Graphics.ES20.QueryTarget target)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glEndQueryEXT((QueryTarget)target);
+                Delegates.glEndQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target);
                 #if DEBUG
                 }
                 #endif
@@ -24279,7 +24279,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            void GetQuery(QueryTarget target, GetQueryParam pname, [OutAttribute] Int32[] @params)
+            void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24289,7 +24289,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryivEXT((QueryTarget)target, (GetQueryParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24300,7 +24300,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            void GetQuery(QueryTarget target, GetQueryParam pname, [OutAttribute] out Int32 @params)
+            void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24310,7 +24310,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryivEXT((QueryTarget)target, (GetQueryParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24323,13 +24323,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            unsafe void GetQuery(QueryTarget target, GetQueryParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryivEXT((QueryTarget)target, (GetQueryParam)pname, (Int32*)@params);
+                Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24356,7 +24356,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24366,7 +24366,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24395,7 +24395,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24405,7 +24405,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24436,13 +24436,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24470,7 +24470,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24480,7 +24480,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24510,7 +24510,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24520,7 +24520,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24551,13 +24551,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (GetQueryObjectParam)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24584,7 +24584,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24594,7 +24594,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24623,7 +24623,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24633,7 +24633,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24664,13 +24664,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24698,7 +24698,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24708,7 +24708,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24738,7 +24738,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24748,7 +24748,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24779,13 +24779,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (GetQueryObjectParam)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24813,7 +24813,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24823,7 +24823,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24853,7 +24853,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] out UInt64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24863,7 +24863,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24894,13 +24894,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt64*)@params);
+                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24928,7 +24928,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24938,7 +24938,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24968,7 +24968,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] out UInt32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24978,7 +24978,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -25009,13 +25009,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectuivEXT((UInt32)id, (GetQueryObjectParam)pname, (UInt32*)@params);
+                Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -26224,13 +26224,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
+            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -26258,13 +26258,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
+            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -34920,13 +34920,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferNV")]
             public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (BlitFramebufferFilter)filter);
+                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
                 #if DEBUG
                 }
                 #endif
@@ -37641,13 +37641,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [OutAttribute] IntPtr @params)
+            void GetBufferPointer(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (BufferPointer)pname, (IntPtr)@params);
+                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params);
                 #if DEBUG
                 }
                 #endif
@@ -37656,7 +37656,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37666,7 +37666,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37680,7 +37680,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [InAttribute, OutAttribute] T2[,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37690,7 +37690,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37704,7 +37704,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37714,7 +37714,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37728,7 +37728,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37738,7 +37738,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                     @params = (T2)@params_ptr.Target;
                 }
                 finally
diff --git a/Source/OpenTK/Graphics/ES20/ES20Core.cs b/Source/OpenTK/Graphics/ES20/ES20Core.cs
index ce6ab5e0..700912e6 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Core.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Core.cs
@@ -59,7 +59,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BeginPerfMonitorAMD(UInt32 monitor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginQueryEXT", ExactSpelling = true)]
-            internal extern static void BeginQueryEXT(QueryTarget target, UInt32 id);
+            internal extern static void BeginQueryEXT(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindAttribLocation", ExactSpelling = true)]
             internal extern static void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -107,10 +107,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BlendParameteriNV(OpenTK.Graphics.ES20.All pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlitFramebufferANGLE", ExactSpelling = true)]
-            internal extern static void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter);
+            internal extern static void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlitFramebufferNV", ExactSpelling = true)]
-            internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter);
+            internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferData", ExactSpelling = true)]
             internal extern static void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
@@ -326,7 +326,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void EndPerfMonitorAMD(UInt32 monitor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndQueryEXT", ExactSpelling = true)]
-            internal extern static void EndQueryEXT(QueryTarget target);
+            internal extern static void EndQueryEXT(OpenTK.Graphics.ES20.QueryTarget target);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndTilingQCOM", ExactSpelling = true)]
             internal extern static void EndTilingQCOM(UInt32 preserveMask);
@@ -449,7 +449,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetBufferParameteriv(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetBufferPointervOES", ExactSpelling = true)]
-            internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [OutAttribute] IntPtr @params);
+            internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLog", ExactSpelling = true)]
             internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
@@ -548,19 +548,19 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetProgramPipelineivEXT(UInt32 pipeline, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryivEXT(QueryTarget target, GetQueryParam pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryivEXT(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjecti64vEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjecti64vEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectivEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectui64vEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectui64vEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
+            internal extern static unsafe void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectuivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectuivEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
+            internal extern static unsafe void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetRenderbufferParameteriv", ExactSpelling = true)]
             internal extern static unsafe void GetRenderbufferParameteriv(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
@@ -704,7 +704,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteriEXT", ExactSpelling = true)]
-            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value);
+            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramUniform1fEXT", ExactSpelling = true)]
             internal extern static void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
index ce4b8ed9..1c3dbaf0 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
@@ -57,7 +57,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BeginPerfMonitorAMD(UInt32 monitor);
             internal static BeginPerfMonitorAMD glBeginPerfMonitorAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BeginQueryEXT(QueryTarget target, UInt32 id);
+            internal delegate void BeginQueryEXT(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
             internal static BeginQueryEXT glBeginQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -105,10 +105,10 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BlendParameteriNV(OpenTK.Graphics.ES20.All pname, Int32 value);
             internal static BlendParameteriNV glBlendParameteriNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter);
+            internal delegate void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             internal static BlitFramebufferANGLE glBlitFramebufferANGLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, BlitFramebufferFilter filter);
+            internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             internal static BlitFramebufferNV glBlitFramebufferNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
@@ -324,7 +324,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void EndPerfMonitorAMD(UInt32 monitor);
             internal static EndPerfMonitorAMD glEndPerfMonitorAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void EndQueryEXT(QueryTarget target);
+            internal delegate void EndQueryEXT(OpenTK.Graphics.ES20.QueryTarget target);
             internal static EndQueryEXT glEndQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndTilingQCOM(UInt32 preserveMask);
@@ -447,7 +447,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetBufferParameteriv(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetBufferParameteriv glGetBufferParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, BufferPointer pname, [OutAttribute] IntPtr @params);
+            internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
             internal static GetBufferPointervOES glGetBufferPointervOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
@@ -546,19 +546,19 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetProgramPipelineivEXT(UInt32 pipeline, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramPipelineivEXT glGetProgramPipelineivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryivEXT(QueryTarget target, GetQueryParam pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryivEXT(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryivEXT glGetQueryivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
             internal unsafe static GetQueryObjecti64vEXT glGetQueryObjecti64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryObjectivEXT glGetQueryObjectivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
+            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
             internal unsafe static GetQueryObjectui64vEXT glGetQueryObjectui64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
+            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
             internal unsafe static GetQueryObjectuivEXT glGetQueryObjectuivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetRenderbufferParameteriv(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
@@ -702,7 +702,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length);
             internal static ProgramBinaryOES glProgramBinaryOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value);
+            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteriEXT glProgramParameteriEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Enums.cs b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
index 9db26856..278a9376 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
@@ -167,7 +167,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 70 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 69 other functions
     /// </summary>
     public enum All : int
     {
@@ -8140,6 +8140,21 @@ namespace OpenTK.Graphics.ES20
         One = ((int)1)        ,
     }
 
+    /// <summary>
+    /// Used in GL.Angle.BlitFramebuffer, GL.NV.BlitFramebuffer
+    /// </summary>
+    public enum BlitFramebufferFilter : int
+    {
+        /// <summary>
+        /// Original was GL_NEAREST = 0X2600
+        /// </summary>
+        Nearest = ((int)0X2600)        ,
+        /// <summary>
+        /// Original was GL_LINEAR = 0X2601
+        /// </summary>
+        Linear = ((int)0X2601)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -8170,6 +8185,13 @@ namespace OpenTK.Graphics.ES20
         BufferUsage = ((int)0X8765)        ,
     }
 
+    /// <summary>
+    /// Used in GL.Oes.GetBufferPointer
+    /// </summary>
+    public enum BufferPointer : int
+    {
+    }
+
     /// <summary>
     /// Used in GL.BindBuffer, GL.BufferData and 6 other functions
     /// </summary>
@@ -13834,6 +13856,20 @@ namespace OpenTK.Graphics.ES20
         InstrumentBufferPointerSgix = ((int)0x8180)        ,
     }
 
+    /// <summary>
+    /// Used in GL.Ext.GetQueryObject
+    /// </summary>
+    public enum GetQueryObjectParam : int
+    {
+    }
+
+    /// <summary>
+    /// Used in GL.Ext.GetQuery
+    /// </summary>
+    public enum GetQueryParam : int
+    {
+    }
+
     /// <summary>
     /// Used in GL.GetTexParameter
     /// </summary>
@@ -18362,6 +18398,53 @@ namespace OpenTK.Graphics.ES20
     /// Used in GL.GetProgram
     /// </summary>
     public enum ProgramParameter : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.Ext.ProgramParameter
+    /// </summary>
+    public enum ProgramParameterName : int
     {
         /// <summary>
         /// Original was GL_DeleteStatus = 0X8b80
@@ -18665,6 +18748,13 @@ namespace OpenTK.Graphics.ES20
         WriteonlyRenderingQcom = ((int)0x8823)        ,
     }
 
+    /// <summary>
+    /// Used in GL.Ext.BeginQuery, GL.Ext.EndQuery and 1 other function
+    /// </summary>
+    public enum QueryTarget : int
+    {
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index 2a58cd50..7450cd34 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -2474,13 +2474,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glBeginTransformFeedback")]
         public static 
-        void BeginTransformFeedback(OpenTK.Graphics.ES30.BeginFeedbackMode primitiveMode)
+        void BeginTransformFeedback(OpenTK.Graphics.ES30.TransformFeedbackPrimitiveType primitiveMode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBeginTransformFeedback((OpenTK.Graphics.ES30.BeginFeedbackMode)primitiveMode);
+            Delegates.glBeginTransformFeedback((OpenTK.Graphics.ES30.TransformFeedbackPrimitiveType)primitiveMode);
             #if DEBUG
             }
             #endif
@@ -12629,7 +12629,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12639,7 +12639,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -12673,7 +12673,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12683,7 +12683,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -12719,13 +12719,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        unsafe void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -12758,7 +12758,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12768,7 +12768,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -12803,7 +12803,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12813,7 +12813,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -12849,13 +12849,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        unsafe void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.ES30.ActiveUniformBlockParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -13081,7 +13081,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32[] uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32[] uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13092,7 +13092,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (Int32* uniformIndices_ptr = uniformIndices)
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -13131,7 +13131,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        void GetActiveUniforms(Int32 program, Int32 uniformCount, ref Int32 uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetActiveUniforms(Int32 program, Int32 uniformCount, ref Int32 uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13142,7 +13142,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (Int32* uniformIndices_ptr = &uniformIndices)
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -13183,13 +13183,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -13227,7 +13227,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32[] uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32[] uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13238,7 +13238,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (UInt32* uniformIndices_ptr = uniformIndices)
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -13278,7 +13278,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        void GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13289,7 +13289,7 @@ namespace OpenTK.Graphics.ES30
                 fixed (UInt32* uniformIndices_ptr = &uniformIndices)
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -13330,13 +13330,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.ES30.ActiveUniformParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -20144,7 +20144,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES30.All type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES30.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20154,9 +20154,9 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.ES30.All* type_ptr = &type)
+                fixed (OpenTK.Graphics.ES30.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.ES30.All*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.ES30.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -20209,13 +20209,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.All* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES30.All*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES30.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -20263,7 +20263,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES30.All type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES30.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20273,9 +20273,9 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.ES30.All* type_ptr = &type)
+                fixed (OpenTK.Graphics.ES30.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.ES30.All*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.ES30.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -20328,13 +20328,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.All* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES30.All*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES30.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -24056,13 +24056,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(Int32 program, OpenTK.Graphics.ES30.All pname, Int32 value)
+        void ProgramParameter(Int32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.ES30.All)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -24090,13 +24090,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glProgramParameteri")]
         public static 
-        void ProgramParameter(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value)
+        void ProgramParameter(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.ES30.All)pname, (Int32)value);
+            Delegates.glProgramParameteri((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameterName)pname, (Int32)value);
             #if DEBUG
             }
             #endif
@@ -29202,13 +29202,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTransformFeedbackVaryings")]
         public static 
-        void TransformFeedbackVaryings(Int32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.All bufferMode)
+        void TransformFeedbackVaryings(Int32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.TransformFeedbackMode bufferMode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String[])varyings, (OpenTK.Graphics.ES30.All)bufferMode);
+            Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String[])varyings, (OpenTK.Graphics.ES30.TransformFeedbackMode)bufferMode);
             #if DEBUG
             }
             #endif
@@ -29241,13 +29241,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTransformFeedbackVaryings")]
         public static 
-        void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.All bufferMode)
+        void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.TransformFeedbackMode bufferMode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String[])varyings, (OpenTK.Graphics.ES30.All)bufferMode);
+            Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String[])varyings, (OpenTK.Graphics.ES30.TransformFeedbackMode)bufferMode);
             #if DEBUG
             }
             #endif
@@ -33994,13 +33994,13 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, IntPtr pointer)
+        void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer);
+            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -34009,7 +34009,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34019,7 +34019,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34033,7 +34033,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[,] pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34043,7 +34043,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34057,7 +34057,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34067,7 +34067,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34081,7 +34081,7 @@ namespace OpenTK.Graphics.ES30
         /// <summary>[requires: v3.0 and ES_VERSION_3_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34091,7 +34091,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                 pointer = (T4)pointer_ptr.Target;
             }
             finally
@@ -34107,13 +34107,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, IntPtr pointer)
+        void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer);
+            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -34123,7 +34123,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34133,7 +34133,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34148,7 +34148,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[,] pointer)
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34158,7 +34158,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34173,7 +34173,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34183,7 +34183,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -34198,7 +34198,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -34208,7 +34208,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.All)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.ES30.VertexAttribIntegerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                 pointer = (T4)pointer_ptr.Target;
             }
             finally
@@ -39631,13 +39631,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(Int32 program, OpenTK.Graphics.ES30.All pname, Int32 value)
+            void ProgramParameter(Int32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES30.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -39665,13 +39665,13 @@ namespace OpenTK.Graphics.ES30
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value)
+            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES30.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES30.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index 3cc7ed11..b2d13681 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -63,7 +63,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void BeginQueryEXT(OpenTK.Graphics.ES30.QueryTarget target, UInt32 id);
             internal static BeginQueryEXT glBeginQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BeginTransformFeedback(OpenTK.Graphics.ES30.BeginFeedbackMode primitiveMode);
+            internal delegate void BeginTransformFeedback(OpenTK.Graphics.ES30.TransformFeedbackPrimitiveType primitiveMode);
             internal static BeginTransformFeedback glBeginTransformFeedback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -540,13 +540,13 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.ActiveUniformType* type, [OutAttribute] StringBuilder name);
             internal unsafe static GetActiveUniform glGetActiveUniform;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetActiveUniformBlockiv(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetActiveUniformBlockiv(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetActiveUniformBlockiv glGetActiveUniformBlockiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetActiveUniformBlockName(UInt32 program, UInt32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName);
             internal unsafe static GetActiveUniformBlockName glGetActiveUniformBlockName;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetActiveUniformsiv(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetActiveUniformsiv(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetActiveUniformsiv glGetActiveUniformsiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders);
@@ -744,7 +744,7 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void GetTexParameteriv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetTexParameteriv glGetTexParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.All* type, [OutAttribute] StringBuilder name);
+            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             internal unsafe static GetTransformFeedbackVarying glGetTransformFeedbackVarying;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -906,10 +906,10 @@ namespace OpenTK.Graphics.ES30
             internal delegate void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES30.All binaryFormat, IntPtr binary, Int32 length);
             internal static ProgramBinaryOES glProgramBinaryOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value);
+            internal delegate void ProgramParameteri(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteri glProgramParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value);
+            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteriEXT glProgramParameteriEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
@@ -1176,7 +1176,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void TextureStorage3DEXT(UInt32 texture, OpenTK.Graphics.ES30.All target, Int32 levels, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth);
             internal static TextureStorage3DEXT glTextureStorage3DEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.All bufferMode);
+            internal delegate void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.TransformFeedbackMode bufferMode);
             internal static TransformFeedbackVaryings glTransformFeedbackVaryings;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Uniform1f(Int32 location, Single v0);
@@ -1368,7 +1368,7 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void VertexAttribI4uiv(UInt32 index, UInt32* v);
             internal unsafe static VertexAttribI4uiv glVertexAttribI4uiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, IntPtr pointer);
+            internal delegate void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, IntPtr pointer);
             internal static VertexAttribIPointer glVertexAttribIPointer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer);
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index b42999b5..8d707c4c 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -61,34 +61,164 @@ namespace OpenTK.Graphics.ES30
     /// </summary>
     public enum ActiveAttribType : int
     {
+        /// <summary>
+        /// Original was GL_INT = 0X1404
+        /// </summary>
+        Int = ((int)0X1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
         /// <summary>
         /// Original was GL_Float = 0X1406
         /// </summary>
         Float = ((int)0X1406)        ,
         /// <summary>
-        /// Original was GL_FloatVec2 = 0X8b50
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
         /// </summary>
-        FloatVec2 = ((int)0X8b50)        ,
+        FloatVec2 = ((int)0x8B50)        ,
         /// <summary>
-        /// Original was GL_FloatVec3 = 0X8b51
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
         /// </summary>
-        FloatVec3 = ((int)0X8b51)        ,
+        FloatVec3 = ((int)0x8B51)        ,
         /// <summary>
-        /// Original was GL_FloatVec4 = 0X8b52
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
         /// </summary>
-        FloatVec4 = ((int)0X8b52)        ,
+        FloatVec4 = ((int)0x8B52)        ,
         /// <summary>
-        /// Original was GL_FloatMat2 = 0X8b5a
+        /// Original was GL_INT_VEC2 = 0x8B53
         /// </summary>
-        FloatMat2 = ((int)0X8b5a)        ,
+        IntVec2 = ((int)0x8B53)        ,
         /// <summary>
-        /// Original was GL_FloatMat3 = 0X8b5b
+        /// Original was GL_INT_VEC3 = 0x8B54
         /// </summary>
-        FloatMat3 = ((int)0X8b5b)        ,
+        IntVec3 = ((int)0x8B54)        ,
         /// <summary>
-        /// Original was GL_FloatMat4 = 0X8b5c
+        /// Original was GL_INT_VEC4 = 0x8B55
         /// </summary>
-        FloatMat4 = ((int)0X8b5c)        ,
+        IntVec4 = ((int)0x8B55)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
+        /// </summary>
+        FloatMat2 = ((int)0x8B5A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
+        /// </summary>
+        FloatMat3 = ((int)0x8B5B)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
+        /// </summary>
+        FloatMat4 = ((int)0x8B5C)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = ((int)0x8B65)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = ((int)0x8B66)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
+        /// </summary>
+        FloatMat3x2 = ((int)0x8B67)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = ((int)0x8B68)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = ((int)0x8B69)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = ((int)0x8B6A)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = ((int)0x8DC6)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = ((int)0x8DC7)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = ((int)0x8DC8)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.GetActiveUniformBlock
+    /// </summary>
+    public enum ActiveUniformBlockParameter : int
+    {
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_BINDING = 0x8A3F
+        /// </summary>
+        UniformBlockBinding = ((int)0x8A3F)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40
+        /// </summary>
+        UniformBlockDataSize = ((int)0x8A40)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41
+        /// </summary>
+        UniformBlockNameLength = ((int)0x8A41)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42
+        /// </summary>
+        UniformBlockActiveUniforms = ((int)0x8A42)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43
+        /// </summary>
+        UniformBlockActiveUniformIndices = ((int)0x8A43)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44
+        /// </summary>
+        UniformBlockReferencedByVertexShader = ((int)0x8A44)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46
+        /// </summary>
+        UniformBlockReferencedByFragmentShader = ((int)0x8A46)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.GetActiveUniforms
+    /// </summary>
+    public enum ActiveUniformParameter : int
+    {
+        /// <summary>
+        /// Original was GL_UNIFORM_TYPE = 0x8A37
+        /// </summary>
+        UniformType = ((int)0x8A37)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_SIZE = 0x8A38
+        /// </summary>
+        UniformSize = ((int)0x8A38)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_NAME_LENGTH = 0x8A39
+        /// </summary>
+        UniformNameLength = ((int)0x8A39)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_INDEX = 0x8A3A
+        /// </summary>
+        UniformBlockIndex = ((int)0x8A3A)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_OFFSET = 0x8A3B
+        /// </summary>
+        UniformOffset = ((int)0x8A3B)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_ARRAY_STRIDE = 0x8A3C
+        /// </summary>
+        UniformArrayStride = ((int)0x8A3C)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_MATRIX_STRIDE = 0x8A3D
+        /// </summary>
+        UniformMatrixStride = ((int)0x8A3D)        ,
+        /// <summary>
+        /// Original was GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E
+        /// </summary>
+        UniformIsRowMajor = ((int)0x8A3E)        ,
     }
 
     /// <summary>
@@ -101,73 +231,161 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Int = ((int)0X1404)        ,
         /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
+        /// <summary>
         /// Original was GL_Float = 0X1406
         /// </summary>
         Float = ((int)0X1406)        ,
         /// <summary>
-        /// Original was GL_FloatVec2 = 0X8b50
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
         /// </summary>
-        FloatVec2 = ((int)0X8b50)        ,
+        FloatVec2 = ((int)0x8B50)        ,
         /// <summary>
-        /// Original was GL_FloatVec3 = 0X8b51
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
         /// </summary>
-        FloatVec3 = ((int)0X8b51)        ,
+        FloatVec3 = ((int)0x8B51)        ,
         /// <summary>
-        /// Original was GL_FloatVec4 = 0X8b52
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
         /// </summary>
-        FloatVec4 = ((int)0X8b52)        ,
+        FloatVec4 = ((int)0x8B52)        ,
         /// <summary>
-        /// Original was GL_IntVec2 = 0X8b53
+        /// Original was GL_INT_VEC2 = 0x8B53
         /// </summary>
-        IntVec2 = ((int)0X8b53)        ,
+        IntVec2 = ((int)0x8B53)        ,
         /// <summary>
-        /// Original was GL_IntVec3 = 0X8b54
+        /// Original was GL_INT_VEC3 = 0x8B54
         /// </summary>
-        IntVec3 = ((int)0X8b54)        ,
+        IntVec3 = ((int)0x8B54)        ,
         /// <summary>
-        /// Original was GL_IntVec4 = 0X8b55
+        /// Original was GL_INT_VEC4 = 0x8B55
         /// </summary>
-        IntVec4 = ((int)0X8b55)        ,
+        IntVec4 = ((int)0x8B55)        ,
         /// <summary>
         /// Original was GL_Bool = 0X8b56
         /// </summary>
         Bool = ((int)0X8b56)        ,
         /// <summary>
-        /// Original was GL_BoolVec2 = 0X8b57
+        /// Original was GL_BOOL_VEC2 = 0x8B57
         /// </summary>
-        BoolVec2 = ((int)0X8b57)        ,
+        BoolVec2 = ((int)0x8B57)        ,
         /// <summary>
-        /// Original was GL_BoolVec3 = 0X8b58
+        /// Original was GL_BOOL_VEC3 = 0x8B58
         /// </summary>
-        BoolVec3 = ((int)0X8b58)        ,
+        BoolVec3 = ((int)0x8B58)        ,
         /// <summary>
-        /// Original was GL_BoolVec4 = 0X8b59
+        /// Original was GL_BOOL_VEC4 = 0x8B59
         /// </summary>
-        BoolVec4 = ((int)0X8b59)        ,
+        BoolVec4 = ((int)0x8B59)        ,
         /// <summary>
-        /// Original was GL_FloatMat2 = 0X8b5a
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
         /// </summary>
-        FloatMat2 = ((int)0X8b5a)        ,
+        FloatMat2 = ((int)0x8B5A)        ,
         /// <summary>
-        /// Original was GL_FloatMat3 = 0X8b5b
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
         /// </summary>
-        FloatMat3 = ((int)0X8b5b)        ,
+        FloatMat3 = ((int)0x8B5B)        ,
         /// <summary>
-        /// Original was GL_FloatMat4 = 0X8b5c
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
         /// </summary>
-        FloatMat4 = ((int)0X8b5c)        ,
+        FloatMat4 = ((int)0x8B5C)        ,
         /// <summary>
-        /// Original was GL_Sampler2D = 0X8b5e
+        /// Original was GL_SAMPLER_2D = 0x8B5E
         /// </summary>
-        Sampler2D = ((int)0X8b5e)        ,
+        Sampler2D = ((int)0x8B5E)        ,
         /// <summary>
-        /// Original was GL_SamplerCube = 0X8b60
+        /// Original was GL_SAMPLER_3D = 0x8B5F
         /// </summary>
-        SamplerCube = ((int)0X8b60)        ,
+        Sampler3D = ((int)0x8B5F)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER_CUBE = 0x8B60
+        /// </summary>
+        SamplerCube = ((int)0x8B60)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER_2D_SHADOW = 0x8B62
+        /// </summary>
+        Sampler2DShadow = ((int)0x8B62)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = ((int)0x8B65)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = ((int)0x8B66)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = ((int)0x8B68)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = ((int)0x8B69)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = ((int)0x8B6A)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER_2D_ARRAY = 0x8DC1
+        /// </summary>
+        Sampler2DArray = ((int)0x8DC1)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER_2D_ARRAY_SHADOW = 0x8DC4
+        /// </summary>
+        Sampler2DArrayShadow = ((int)0x8DC4)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER_CUBE_SHADOW = 0x8DC5
+        /// </summary>
+        SamplerCubeShadow = ((int)0x8DC5)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = ((int)0x8DC6)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = ((int)0x8DC7)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = ((int)0x8DC8)        ,
+        /// <summary>
+        /// Original was GL_INT_SAMPLER_2D = 0x8DCA
+        /// </summary>
+        IntSampler2D = ((int)0x8DCA)        ,
+        /// <summary>
+        /// Original was GL_INT_SAMPLER_3D = 0x8DCB
+        /// </summary>
+        IntSampler3D = ((int)0x8DCB)        ,
+        /// <summary>
+        /// Original was GL_INT_SAMPLER_CUBE = 0x8DCC
+        /// </summary>
+        IntSamplerCube = ((int)0x8DCC)        ,
+        /// <summary>
+        /// Original was GL_INT_SAMPLER_2D_ARRAY = 0x8DCF
+        /// </summary>
+        IntSampler2DArray = ((int)0x8DCF)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_SAMPLER_2D = 0x8DD2
+        /// </summary>
+        UnsignedIntSampler2D = ((int)0x8DD2)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_SAMPLER_3D = 0x8DD3
+        /// </summary>
+        UnsignedIntSampler3D = ((int)0x8DD3)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4
+        /// </summary>
+        UnsignedIntSamplerCube = ((int)0x8DD4)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7
+        /// </summary>
+        UnsignedIntSampler2DArray = ((int)0x8DD7)        ,
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 95 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 88 other functions
     /// </summary>
     public enum All : int
     {
@@ -8965,25 +9183,6 @@ namespace OpenTK.Graphics.ES30
         AllAttribBits = unchecked((int)0xFFFFFFFF)        ,
     }
 
-    /// <summary>
-    /// Used in GL.BeginTransformFeedback
-    /// </summary>
-    public enum BeginFeedbackMode : int
-    {
-        /// <summary>
-        /// Original was GL_POINTS = 0X0000
-        /// </summary>
-        Points = ((int)0X0000)        ,
-        /// <summary>
-        /// Original was GL_LINES = 0X0001
-        /// </summary>
-        Lines = ((int)0X0001)        ,
-        /// <summary>
-        /// Original was GL_TRIANGLES = 0X0004
-        /// </summary>
-        Triangles = ((int)0X0004)        ,
-    }
-
     /// <summary>
     /// Used in GL.DrawArrays, GL.DrawElements
     /// </summary>
@@ -10224,13 +10423,17 @@ namespace OpenTK.Graphics.ES30
     public enum DrawElementsType : int
     {
         /// <summary>
-        /// Original was GL_UnsignedByte = 0X1401
+        /// Original was GL_UNSIGNED_BYTE = 0x1401
         /// </summary>
-        UnsignedByte = ((int)0X1401)        ,
+        UnsignedByte = ((int)0x1401)        ,
         /// <summary>
-        /// Original was GL_UnsignedShort = 0X1403
+        /// Original was GL_UNSIGNED_SHORT = 0x1403
         /// </summary>
-        UnsignedShort = ((int)0X1403)        ,
+        UnsignedShort = ((int)0x1403)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
     }
 
     /// <summary>
@@ -10670,6 +10873,10 @@ namespace OpenTK.Graphics.ES30
         /// Original was GL_FRAGMENT_LIGHT7_SGIX = 0x8413
         /// </summary>
         FragmentLight7Sgix = ((int)0x8413)        ,
+        /// <summary>
+        /// Original was GL_PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69
+        /// </summary>
+        PrimitiveRestartFixedIndex = ((int)0x8D69)        ,
     }
 
     /// <summary>
@@ -20874,6 +21081,73 @@ namespace OpenTK.Graphics.ES30
     /// Used in GL.GetProgram
     /// </summary>
     public enum ProgramParameter : int
+    {
+        /// <summary>
+        /// Original was GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257
+        /// </summary>
+        ProgramBinaryRetrievableHint = ((int)0x8257)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35
+        /// </summary>
+        ActiveUniformBlockMaxNameLength = ((int)0x8A35)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36
+        /// </summary>
+        ActiveUniformBlocks = ((int)0x8A36)        ,
+        /// <summary>
+        /// Original was GL_DELETE_STATUS = 0x8B80
+        /// </summary>
+        DeleteStatus = ((int)0x8B80)        ,
+        /// <summary>
+        /// Original was GL_LINK_STATUS = 0x8B82
+        /// </summary>
+        LinkStatus = ((int)0x8B82)        ,
+        /// <summary>
+        /// Original was GL_VALIDATE_STATUS = 0x8B83
+        /// </summary>
+        ValidateStatus = ((int)0x8B83)        ,
+        /// <summary>
+        /// Original was GL_INFO_LOG_LENGTH = 0x8B84
+        /// </summary>
+        InfoLogLength = ((int)0x8B84)        ,
+        /// <summary>
+        /// Original was GL_ATTACHED_SHADERS = 0x8B85
+        /// </summary>
+        AttachedShaders = ((int)0x8B85)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORMS = 0x8B86
+        /// </summary>
+        ActiveUniforms = ((int)0x8B86)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87
+        /// </summary>
+        ActiveUniformMaxLength = ((int)0x8B87)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTES = 0x8B89
+        /// </summary>
+        ActiveAttributes = ((int)0x8B89)        ,
+        /// <summary>
+        /// Original was GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A
+        /// </summary>
+        ActiveAttributeMaxLength = ((int)0x8B8A)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
+        /// </summary>
+        TransformFeedbackVaryingMaxLength = ((int)0x8C76)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
+        /// </summary>
+        TransformFeedbackBufferMode = ((int)0x8C7F)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
+        /// </summary>
+        TransformFeedbackVaryings = ((int)0x8C83)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.ProgramParameter, GL.Ext.ProgramParameter
+    /// </summary>
+    public enum ProgramParameterName : int
     {
         /// <summary>
         /// Original was GL_DeleteStatus = 0X8b80
@@ -21537,29 +21811,29 @@ namespace OpenTK.Graphics.ES30
     public enum ShaderPrecision : int
     {
         /// <summary>
-        /// Original was GL_LowFloat = 0X8df0
+        /// Original was GL_LOW_FLOAT = 0x8DF0
         /// </summary>
-        LowFloat = ((int)0X8df0)        ,
+        LowFloat = ((int)0x8DF0)        ,
         /// <summary>
-        /// Original was GL_MediumFloat = 0X8df1
+        /// Original was GL_MEDIUM_FLOAT = 0x8DF1
         /// </summary>
-        MediumFloat = ((int)0X8df1)        ,
+        MediumFloat = ((int)0x8DF1)        ,
         /// <summary>
-        /// Original was GL_HighFloat = 0X8df2
+        /// Original was GL_HIGH_FLOAT = 0x8DF2
         /// </summary>
-        HighFloat = ((int)0X8df2)        ,
+        HighFloat = ((int)0x8DF2)        ,
         /// <summary>
-        /// Original was GL_LowInt = 0X8df3
+        /// Original was GL_LOW_INT = 0x8DF3
         /// </summary>
-        LowInt = ((int)0X8df3)        ,
+        LowInt = ((int)0x8DF3)        ,
         /// <summary>
-        /// Original was GL_MediumInt = 0X8df4
+        /// Original was GL_MEDIUM_INT = 0x8DF4
         /// </summary>
-        MediumInt = ((int)0X8df4)        ,
+        MediumInt = ((int)0x8DF4)        ,
         /// <summary>
-        /// Original was GL_HighInt = 0X8df5
+        /// Original was GL_HIGH_INT = 0x8DF5
         /// </summary>
-        HighInt = ((int)0X8df5)        ,
+        HighInt = ((int)0x8DF5)        ,
     }
 
     /// <summary>
@@ -21568,13 +21842,13 @@ namespace OpenTK.Graphics.ES30
     public enum ShaderType : int
     {
         /// <summary>
-        /// Original was GL_FragmentShader = 0X8b30
+        /// Original was GL_FRAGMENT_SHADER = 0x8B30
         /// </summary>
-        FragmentShader = ((int)0X8b30)        ,
+        FragmentShader = ((int)0x8B30)        ,
         /// <summary>
-        /// Original was GL_VertexShader = 0X8b31
+        /// Original was GL_VERTEX_SHADER = 0x8B31
         /// </summary>
-        VertexShader = ((int)0X8b31)        ,
+        VertexShader = ((int)0x8B31)        ,
     }
 
     /// <summary>
@@ -22435,6 +22709,40 @@ namespace OpenTK.Graphics.ES30
         ClampToEdgeSgis = ((int)0x812F)        ,
     }
 
+    /// <summary>
+    /// Used in GL.TransformFeedbackVaryings
+    /// </summary>
+    public enum TransformFeedbackMode : int
+    {
+        /// <summary>
+        /// Original was GL_INTERLEAVED_ATTRIBS = 0x8C8C
+        /// </summary>
+        InterleavedAttribs = ((int)0x8C8C)        ,
+        /// <summary>
+        /// Original was GL_SEPARATE_ATTRIBS = 0x8C8D
+        /// </summary>
+        SeparateAttribs = ((int)0x8C8D)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.BeginTransformFeedback
+    /// </summary>
+    public enum TransformFeedbackPrimitiveType : int
+    {
+        /// <summary>
+        /// Original was GL_POINTS = 0X0000
+        /// </summary>
+        Points = ((int)0X0000)        ,
+        /// <summary>
+        /// Original was GL_LINES = 0X0001
+        /// </summary>
+        Lines = ((int)0X0001)        ,
+        /// <summary>
+        /// Original was GL_TRIANGLES = 0X0004
+        /// </summary>
+        Triangles = ((int)0X0004)        ,
+    }
+
     /// <summary>
     /// Used in GL.BindTransformFeedback
     /// </summary>
@@ -22446,6 +22754,97 @@ namespace OpenTK.Graphics.ES30
         TransformFeedback = ((int)0x8E22)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetTransformFeedbackVarying
+    /// </summary>
+    public enum TransformFeedbackType : int
+    {
+        /// <summary>
+        /// Original was GL_INT = 0X1404
+        /// </summary>
+        Int = ((int)0X1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
+        /// <summary>
+        /// Original was GL_FLOAT = 0X1406
+        /// </summary>
+        Float = ((int)0X1406)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
+        /// </summary>
+        FloatVec2 = ((int)0x8B50)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
+        /// </summary>
+        FloatVec3 = ((int)0x8B51)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
+        /// </summary>
+        FloatVec4 = ((int)0x8B52)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC2 = 0x8B53
+        /// </summary>
+        IntVec2 = ((int)0x8B53)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC3 = 0x8B54
+        /// </summary>
+        IntVec3 = ((int)0x8B54)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC4 = 0x8B55
+        /// </summary>
+        IntVec4 = ((int)0x8B55)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
+        /// </summary>
+        FloatMat2 = ((int)0x8B5A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
+        /// </summary>
+        FloatMat3 = ((int)0x8B5B)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
+        /// </summary>
+        FloatMat4 = ((int)0x8B5C)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = ((int)0x8B65)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = ((int)0x8B66)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
+        /// </summary>
+        FloatMat3x2 = ((int)0x8B67)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = ((int)0x8B68)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = ((int)0x8B69)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = ((int)0x8B6A)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = ((int)0x8DC6)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = ((int)0x8DC7)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = ((int)0x8DC8)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -22494,39 +22893,78 @@ namespace OpenTK.Graphics.ES30
         AllShaderBitsExt = unchecked((int)0xFFFFFFFF)        ,
     }
 
+    /// <summary>
+    /// Used in GL.VertexAttribIPointer
+    /// </summary>
+    public enum VertexAttribIntegerType : int
+    {
+        /// <summary>
+        /// Original was GL_BYTE = 0X1400
+        /// </summary>
+        Byte = ((int)0X1400)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_BYTE = 0x1401
+        /// </summary>
+        UnsignedByte = ((int)0x1401)        ,
+        /// <summary>
+        /// Original was GL_SHORT = 0X1402
+        /// </summary>
+        Short = ((int)0X1402)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_SHORT = 0x1403
+        /// </summary>
+        UnsignedShort = ((int)0x1403)        ,
+        /// <summary>
+        /// Original was GL_INT = 0X1404
+        /// </summary>
+        Int = ((int)0X1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
+    }
+
     /// <summary>
     /// Used in GL.GetVertexAttrib
     /// </summary>
     public enum VertexAttribParameter : int
     {
         /// <summary>
-        /// Original was GL_VertexAttribArrayEnabled = 0X8622
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622
         /// </summary>
-        VertexAttribArrayEnabled = ((int)0X8622)        ,
+        VertexAttribArrayEnabled = ((int)0x8622)        ,
         /// <summary>
-        /// Original was GL_VertexAttribArraySize = 0X8623
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623
         /// </summary>
-        VertexAttribArraySize = ((int)0X8623)        ,
+        VertexAttribArraySize = ((int)0x8623)        ,
         /// <summary>
-        /// Original was GL_VertexAttribArrayStride = 0X8624
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624
         /// </summary>
-        VertexAttribArrayStride = ((int)0X8624)        ,
+        VertexAttribArrayStride = ((int)0x8624)        ,
         /// <summary>
-        /// Original was GL_VertexAttribArrayType = 0X8625
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625
         /// </summary>
-        VertexAttribArrayType = ((int)0X8625)        ,
+        VertexAttribArrayType = ((int)0x8625)        ,
         /// <summary>
-        /// Original was GL_CurrentVertexAttrib = 0X8626
+        /// Original was GL_CURRENT_VERTEX_ATTRIB = 0x8626
         /// </summary>
-        CurrentVertexAttrib = ((int)0X8626)        ,
+        CurrentVertexAttrib = ((int)0x8626)        ,
         /// <summary>
-        /// Original was GL_VertexAttribArrayNormalized = 0X886a
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A
         /// </summary>
-        VertexAttribArrayNormalized = ((int)0X886a)        ,
+        VertexAttribArrayNormalized = ((int)0x886A)        ,
         /// <summary>
-        /// Original was GL_VertexAttribArrayBufferBinding = 0X889f
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F
         /// </summary>
-        VertexAttribArrayBufferBinding = ((int)0X889f)        ,
+        VertexAttribArrayBufferBinding = ((int)0x889F)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD
+        /// </summary>
+        VertexAttribArrayInteger = ((int)0x88FD)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE
+        /// </summary>
+        VertexAttribArrayDivisor = ((int)0x88FE)        ,
     }
 
     /// <summary>
@@ -22535,9 +22973,9 @@ namespace OpenTK.Graphics.ES30
     public enum VertexAttribPointerParameter : int
     {
         /// <summary>
-        /// Original was GL_VertexAttribArrayPointer = 0X8645
+        /// Original was GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645
         /// </summary>
-        VertexAttribArrayPointer = ((int)0X8645)        ,
+        VertexAttribArrayPointer = ((int)0x8645)        ,
     }
 
     /// <summary>
@@ -22550,25 +22988,45 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Byte = ((int)0X1400)        ,
         /// <summary>
-        /// Original was GL_UnsignedByte = 0X1401
+        /// Original was GL_UNSIGNED_BYTE = 0x1401
         /// </summary>
-        UnsignedByte = ((int)0X1401)        ,
+        UnsignedByte = ((int)0x1401)        ,
         /// <summary>
         /// Original was GL_Short = 0X1402
         /// </summary>
         Short = ((int)0X1402)        ,
         /// <summary>
-        /// Original was GL_UnsignedShort = 0X1403
+        /// Original was GL_UNSIGNED_SHORT = 0x1403
         /// </summary>
-        UnsignedShort = ((int)0X1403)        ,
+        UnsignedShort = ((int)0x1403)        ,
+        /// <summary>
+        /// Original was GL_INT = 0X1404
+        /// </summary>
+        Int = ((int)0X1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
         /// <summary>
         /// Original was GL_Float = 0X1406
         /// </summary>
         Float = ((int)0X1406)        ,
         /// <summary>
+        /// Original was GL_HALF_FLOAT = 0x140B
+        /// </summary>
+        HalfFloat = ((int)0x140B)        ,
+        /// <summary>
         /// Original was GL_Fixed = 0X140c
         /// </summary>
         Fixed = ((int)0X140c)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368
+        /// </summary>
+        UnsignedInt2101010Rev = ((int)0x8368)        ,
+        /// <summary>
+        /// Original was GL_INT_2_10_10_10_REV = 0x8D9F
+        /// </summary>
+        Int2101010Rev = ((int)0x8D9F)        ,
     }
 
     /// <summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs
index 2d6fa8b0..548158f8 100644
--- a/Source/OpenTK/Graphics/ES30/ES3Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs
@@ -65,7 +65,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void BeginQueryEXT(OpenTK.Graphics.ES30.QueryTarget target, UInt32 id);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedback", ExactSpelling = true)]
-            internal extern static void BeginTransformFeedback(OpenTK.Graphics.ES30.BeginFeedbackMode primitiveMode);
+            internal extern static void BeginTransformFeedback(OpenTK.Graphics.ES30.TransformFeedbackPrimitiveType primitiveMode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindAttribLocation", ExactSpelling = true)]
             internal extern static void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -542,13 +542,13 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.ActiveUniformType* type, [OutAttribute] StringBuilder name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetActiveUniformBlockiv", ExactSpelling = true)]
-            internal extern static unsafe void GetActiveUniformBlockiv(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetActiveUniformBlockiv(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.ES30.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetActiveUniformBlockName", ExactSpelling = true)]
             internal extern static unsafe void GetActiveUniformBlockName(UInt32 program, UInt32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetActiveUniformsiv", ExactSpelling = true)]
-            internal extern static unsafe void GetActiveUniformsiv(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetActiveUniformsiv(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.ES30.ActiveUniformParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetAttachedShaders", ExactSpelling = true)]
             internal extern static unsafe void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders);
@@ -746,7 +746,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void GetTexParameteriv(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.GetTextureParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTransformFeedbackVarying", ExactSpelling = true)]
-            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.All* type, [OutAttribute] StringBuilder name);
+            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES30.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTranslatedShaderSourceANGLE", ExactSpelling = true)]
             internal extern static unsafe void GetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -908,10 +908,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES30.All binaryFormat, IntPtr binary, Int32 length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteri", ExactSpelling = true)]
-            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value);
+            internal extern static void ProgramParameteri(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteriEXT", ExactSpelling = true)]
-            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES30.All pname, Int32 value);
+            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES30.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramUniform1fEXT", ExactSpelling = true)]
             internal extern static void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
@@ -1178,7 +1178,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void TextureStorage3DEXT(UInt32 texture, OpenTK.Graphics.ES30.All target, Int32 levels, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTransformFeedbackVaryings", ExactSpelling = true)]
-            internal extern static void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.All bufferMode);
+            internal extern static void TransformFeedbackVaryings(UInt32 program, Int32 count, String[] varyings, OpenTK.Graphics.ES30.TransformFeedbackMode bufferMode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUniform1f", ExactSpelling = true)]
             internal extern static void Uniform1f(Int32 location, Single v0);
@@ -1370,7 +1370,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void VertexAttribI4uiv(UInt32 index, UInt32* v);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glVertexAttribIPointer", ExactSpelling = true)]
-            internal extern static void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.All type, Int32 stride, IntPtr pointer);
+            internal extern static void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribIntegerType type, Int32 stride, IntPtr pointer);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glVertexAttribPointer", ExactSpelling = true)]
             internal extern static void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.ES30.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer);
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 45c323b9..9eaf1f64 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -37549,13 +37549,13 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBeginTransformFeedback")]
         public static 
-        void BeginTransformFeedback(OpenTK.Graphics.OpenGL.BeginFeedbackMode primitiveMode)
+        void BeginTransformFeedback(OpenTK.Graphics.OpenGL.TransformFeedbackPrimitiveType primitiveMode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBeginTransformFeedback((OpenTK.Graphics.OpenGL.BeginFeedbackMode)primitiveMode);
+            Delegates.glBeginTransformFeedback((OpenTK.Graphics.OpenGL.TransformFeedbackPrimitiveType)primitiveMode);
             #if DEBUG
             }
             #endif
@@ -79771,7 +79771,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecisionType precisiontype, [OutAttribute] Int32[] range, [OutAttribute] Int32[] precision)
+        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecision precisiontype, [OutAttribute] Int32[] range, [OutAttribute] Int32[] precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79782,7 +79782,7 @@ namespace OpenTK.Graphics.OpenGL
                 fixed (Int32* range_ptr = range)
                 fixed (Int32* precision_ptr = precision)
                 {
-                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecisionType)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
+                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecision)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
                 }
             }
             #if DEBUG
@@ -79816,7 +79816,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecisionType precisiontype, [OutAttribute] out Int32 range, [OutAttribute] out Int32 precision)
+        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecision precisiontype, [OutAttribute] out Int32 range, [OutAttribute] out Int32 precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79827,7 +79827,7 @@ namespace OpenTK.Graphics.OpenGL
                 fixed (Int32* range_ptr = &range)
                 fixed (Int32* precision_ptr = &precision)
                 {
-                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecisionType)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
+                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecision)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
                     range = *range_ptr;
                     precision = *precision_ptr;
                 }
@@ -79864,13 +79864,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
+        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecisionType)precisiontype, (Int32*)range, (Int32*)precision);
+            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL.ShaderType)shadertype, (OpenTK.Graphics.OpenGL.ShaderPrecision)precisiontype, (Int32*)range, (Int32*)precision);
             #if DEBUG
             }
             #endif
@@ -81871,7 +81871,7 @@ namespace OpenTK.Graphics.OpenGL
                 /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -81881,9 +81881,9 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                fixed (OpenTK.Graphics.OpenGL.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -81936,13 +81936,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -81990,7 +81990,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -82000,9 +82000,9 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.OpenGL.ActiveAttribType* type_ptr = &type)
+                fixed (OpenTK.Graphics.OpenGL.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -82055,13 +82055,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index f75af76e..ffb4a5fd 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -146,7 +146,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void BeginQueryIndexed(OpenTK.Graphics.OpenGL.QueryTarget target, UInt32 index, UInt32 id);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedback", ExactSpelling = true)]
-            internal extern static void BeginTransformFeedback(OpenTK.Graphics.OpenGL.BeginFeedbackMode primitiveMode);
+            internal extern static void BeginTransformFeedback(OpenTK.Graphics.OpenGL.TransformFeedbackPrimitiveType primitiveMode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedbackEXT", ExactSpelling = true)]
             internal extern static void BeginTransformFeedbackEXT(OpenTK.Graphics.OpenGL.ExtTransformFeedback primitiveMode);
@@ -2810,7 +2810,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetShaderiv(UInt32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetShaderPrecisionFormat", ExactSpelling = true)]
-            internal extern static unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
+            internal extern static unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetShaderSource", ExactSpelling = true)]
             internal extern static unsafe void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -2939,7 +2939,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetTrackMatrixivNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTransformFeedbackVarying", ExactSpelling = true)]
-            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name);
+            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTransformFeedbackVaryingEXT", ExactSpelling = true)]
             internal extern static unsafe void GetTransformFeedbackVaryingEXT(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index 630907fa..e836262e 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -144,7 +144,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void BeginQueryIndexed(OpenTK.Graphics.OpenGL.QueryTarget target, UInt32 index, UInt32 id);
             internal static BeginQueryIndexed glBeginQueryIndexed;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BeginTransformFeedback(OpenTK.Graphics.OpenGL.BeginFeedbackMode primitiveMode);
+            internal delegate void BeginTransformFeedback(OpenTK.Graphics.OpenGL.TransformFeedbackPrimitiveType primitiveMode);
             internal static BeginTransformFeedback glBeginTransformFeedback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BeginTransformFeedbackEXT(OpenTK.Graphics.OpenGL.ExtTransformFeedback primitiveMode);
@@ -2808,7 +2808,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetShaderiv(UInt32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetShaderiv glGetShaderiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
+            internal unsafe delegate void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL.ShaderType shadertype, OpenTK.Graphics.OpenGL.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
             internal unsafe static GetShaderPrecisionFormat glGetShaderPrecisionFormat;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -2937,7 +2937,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetTrackMatrixivNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params);
             internal unsafe static GetTrackMatrixivNV glGetTrackMatrixivNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name);
+            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             internal unsafe static GetTransformFeedbackVarying glGetTransformFeedbackVarying;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTransformFeedbackVaryingEXT(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index bb95d4d9..2f3d5ae5 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -57,7 +57,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetActiveAttrib, GL.GetTransformFeedbackVarying
+    /// Used in GL.GetActiveAttrib
     /// </summary>
     public enum ActiveAttribType : int
     {
@@ -27939,7 +27939,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.BeginTransformFeedback
+    /// Not used directly.
     /// </summary>
     public enum BeginFeedbackMode : int
     {
@@ -49768,7 +49768,7 @@ namespace OpenTK.Graphics.OpenGL
     /// <summary>
     /// Used in GL.GetShaderPrecisionFormat
     /// </summary>
-    public enum ShaderPrecisionType : int
+    public enum ShaderPrecision : int
     {
         /// <summary>
         /// Original was GL_LOW_FLOAT = 0x8DF0
@@ -51745,6 +51745,25 @@ namespace OpenTK.Graphics.OpenGL
         SeparateAttribs = ((int)0x8C8D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.BeginTransformFeedback
+    /// </summary>
+    public enum TransformFeedbackPrimitiveType : int
+    {
+        /// <summary>
+        /// Original was GL_POINTS = 0x0000
+        /// </summary>
+        Points = ((int)0x0000)        ,
+        /// <summary>
+        /// Original was GL_LINES = 0x0001
+        /// </summary>
+        Lines = ((int)0x0001)        ,
+        /// <summary>
+        /// Original was GL_TRIANGLES = 0x0004
+        /// </summary>
+        Triangles = ((int)0x0004)        ,
+    }
+
     /// <summary>
     /// Used in GL.BindTransformFeedback
     /// </summary>
@@ -51756,6 +51775,149 @@ namespace OpenTK.Graphics.OpenGL
         TransformFeedback = ((int)0x8E22)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetTransformFeedbackVarying
+    /// </summary>
+    public enum TransformFeedbackType : int
+    {
+        /// <summary>
+        /// Original was GL_INT = 0x1404
+        /// </summary>
+        Int = ((int)0x1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
+        /// <summary>
+        /// Original was GL_FLOAT = 0x1406
+        /// </summary>
+        Float = ((int)0x1406)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE = 0x140A
+        /// </summary>
+        Double = ((int)0x140A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
+        /// </summary>
+        FloatVec2 = ((int)0x8B50)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
+        /// </summary>
+        FloatVec3 = ((int)0x8B51)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
+        /// </summary>
+        FloatVec4 = ((int)0x8B52)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC2 = 0x8B53
+        /// </summary>
+        IntVec2 = ((int)0x8B53)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC3 = 0x8B54
+        /// </summary>
+        IntVec3 = ((int)0x8B54)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC4 = 0x8B55
+        /// </summary>
+        IntVec4 = ((int)0x8B55)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
+        /// </summary>
+        FloatMat2 = ((int)0x8B5A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
+        /// </summary>
+        FloatMat3 = ((int)0x8B5B)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
+        /// </summary>
+        FloatMat4 = ((int)0x8B5C)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = ((int)0x8B65)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = ((int)0x8B66)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
+        /// </summary>
+        FloatMat3x2 = ((int)0x8B67)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = ((int)0x8B68)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = ((int)0x8B69)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = ((int)0x8B6A)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = ((int)0x8DC6)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = ((int)0x8DC7)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = ((int)0x8DC8)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2 = 0x8F46
+        /// </summary>
+        DoubleMat2 = ((int)0x8F46)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3 = 0x8F47
+        /// </summary>
+        DoubleMat3 = ((int)0x8F47)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4 = 0x8F48
+        /// </summary>
+        DoubleMat4 = ((int)0x8F48)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x3 = 0x8F49
+        /// </summary>
+        DoubleMat2x3 = ((int)0x8F49)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x4 = 0x8F4A
+        /// </summary>
+        DoubleMat2x4 = ((int)0x8F4A)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x2 = 0x8F4B
+        /// </summary>
+        DoubleMat3x2 = ((int)0x8F4B)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x4 = 0x8F4C
+        /// </summary>
+        DoubleMat3x4 = ((int)0x8F4C)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x2 = 0x8F4D
+        /// </summary>
+        DoubleMat4x2 = ((int)0x8F4D)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x3 = 0x8F4E
+        /// </summary>
+        DoubleMat4x3 = ((int)0x8F4E)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC2 = 0x8FFC
+        /// </summary>
+        DoubleVec2 = ((int)0x8FFC)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC3 = 0x8FFD
+        /// </summary>
+        DoubleVec3 = ((int)0x8FFD)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC4 = 0x8FFE
+        /// </summary>
+        DoubleVec4 = ((int)0x8FFE)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4.cs b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
index 93f75044..7ba38aec 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -4934,13 +4934,13 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glBeginTransformFeedback")]
         public static 
-        void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.BeginFeedbackMode primitiveMode)
+        void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.TransformFeedbackPrimitiveType primitiveMode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBeginTransformFeedback((OpenTK.Graphics.OpenGL4.BeginFeedbackMode)primitiveMode);
+            Delegates.glBeginTransformFeedback((OpenTK.Graphics.OpenGL4.TransformFeedbackPrimitiveType)primitiveMode);
             #if DEBUG
             }
             #endif
@@ -39983,7 +39983,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecisionType precisiontype, [OutAttribute] Int32[] range, [OutAttribute] Int32[] precision)
+        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecision precisiontype, [OutAttribute] Int32[] range, [OutAttribute] Int32[] precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -39994,7 +39994,7 @@ namespace OpenTK.Graphics.OpenGL4
                 fixed (Int32* range_ptr = range)
                 fixed (Int32* precision_ptr = precision)
                 {
-                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecisionType)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
+                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecision)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
                 }
             }
             #if DEBUG
@@ -40028,7 +40028,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecisionType precisiontype, [OutAttribute] out Int32 range, [OutAttribute] out Int32 precision)
+        void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecision precisiontype, [OutAttribute] out Int32 range, [OutAttribute] out Int32 precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -40039,7 +40039,7 @@ namespace OpenTK.Graphics.OpenGL4
                 fixed (Int32* range_ptr = &range)
                 fixed (Int32* precision_ptr = &precision)
                 {
-                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecisionType)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
+                    Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecision)precisiontype, (Int32*)range_ptr, (Int32*)precision_ptr);
                     range = *range_ptr;
                     precision = *precision_ptr;
                 }
@@ -40076,13 +40076,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_ES2_compatibility|VERSION_4_1", Version = "4.1", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
+        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecisionType)precisiontype, (Int32*)range, (Int32*)precision);
+            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.OpenGL4.ShaderType)shadertype, (OpenTK.Graphics.OpenGL4.ShaderPrecision)precisiontype, (Int32*)range, (Int32*)precision);
             #if DEBUG
             }
             #endif
@@ -41518,7 +41518,7 @@ namespace OpenTK.Graphics.OpenGL4
                 /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL4.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL4.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41528,9 +41528,9 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.OpenGL4.ActiveAttribType* type_ptr = &type)
+                fixed (OpenTK.Graphics.OpenGL4.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL4.ActiveAttribType*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL4.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -41583,13 +41583,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL4.ActiveAttribType*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL4.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -41637,7 +41637,7 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL4.ActiveAttribType type, [OutAttribute] StringBuilder name)
+        void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL4.TransformFeedbackType type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41647,9 +41647,9 @@ namespace OpenTK.Graphics.OpenGL4
             {
                 fixed (Int32* length_ptr = &length)
                 fixed (Int32* size_ptr = &size)
-                fixed (OpenTK.Graphics.OpenGL4.ActiveAttribType* type_ptr = &type)
+                fixed (OpenTK.Graphics.OpenGL4.TransformFeedbackType* type_ptr = &type)
                 {
-                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL4.ActiveAttribType*)type_ptr, (StringBuilder)name);
+                    Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL4.TransformFeedbackType*)type_ptr, (StringBuilder)name);
                     length = *length_ptr;
                     size = *size_ptr;
                     type = *type_ptr;
@@ -41702,13 +41702,13 @@ namespace OpenTK.Graphics.OpenGL4
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.TransformFeedbackType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL4.ActiveAttribType*)type, (StringBuilder)name);
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL4.TransformFeedbackType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
index 1dfa4809..acad4ecc 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
@@ -59,7 +59,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static void BeginQueryIndexed(OpenTK.Graphics.OpenGL4.QueryTarget target, UInt32 index, UInt32 id);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedback", ExactSpelling = true)]
-            internal extern static void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.BeginFeedbackMode primitiveMode);
+            internal extern static void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.TransformFeedbackPrimitiveType primitiveMode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindAttribLocation", ExactSpelling = true)]
             internal extern static void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -905,7 +905,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static unsafe void GetShaderiv(UInt32 shader, OpenTK.Graphics.OpenGL4.ShaderParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetShaderPrecisionFormat", ExactSpelling = true)]
-            internal extern static unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
+            internal extern static unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetShaderSource", ExactSpelling = true)]
             internal extern static unsafe void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -953,7 +953,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal extern static Int64 GetTextureSamplerHandleARB(UInt32 texture, UInt32 sampler);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTransformFeedbackVarying", ExactSpelling = true)]
-            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.ActiveAttribType* type, [OutAttribute] StringBuilder name);
+            internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetUniformBlockIndex", ExactSpelling = true)]
             internal extern static Int32 GetUniformBlockIndex(UInt32 program, String uniformBlockName);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
index a7f31b4e..a2fb9cf8 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
@@ -57,7 +57,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate void BeginQueryIndexed(OpenTK.Graphics.OpenGL4.QueryTarget target, UInt32 index, UInt32 id);
             internal static BeginQueryIndexed glBeginQueryIndexed;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.BeginFeedbackMode primitiveMode);
+            internal delegate void BeginTransformFeedback(OpenTK.Graphics.OpenGL4.TransformFeedbackPrimitiveType primitiveMode);
             internal static BeginTransformFeedback glBeginTransformFeedback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -903,7 +903,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal unsafe delegate void GetShaderiv(UInt32 shader, OpenTK.Graphics.OpenGL4.ShaderParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetShaderiv glGetShaderiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecisionType precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
+            internal unsafe delegate void GetShaderPrecisionFormat(OpenTK.Graphics.OpenGL4.ShaderType shadertype, OpenTK.Graphics.OpenGL4.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision);
             internal unsafe static GetShaderPrecisionFormat glGetShaderPrecisionFormat;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -951,7 +951,7 @@ namespace OpenTK.Graphics.OpenGL4
             internal delegate Int64 GetTextureSamplerHandleARB(UInt32 texture, UInt32 sampler);
             internal static GetTextureSamplerHandleARB glGetTextureSamplerHandleARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.ActiveAttribType* type, [OutAttribute] StringBuilder name);
+            internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL4.TransformFeedbackType* type, [OutAttribute] StringBuilder name);
             internal unsafe static GetTransformFeedbackVarying glGetTransformFeedbackVarying;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate Int32 GetUniformBlockIndex(UInt32 program, String uniformBlockName);
diff --git a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
index e263ff32..68be0b86 100644
--- a/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
@@ -37,7 +37,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.GetActiveAttrib, GL.GetTransformFeedbackVarying
+    /// Used in GL.GetActiveAttrib
     /// </summary>
     public enum ActiveAttribType : int
     {
@@ -14423,7 +14423,7 @@ namespace OpenTK.Graphics.OpenGL4
     }
 
     /// <summary>
-    /// Used in GL.BeginTransformFeedback
+    /// Not used directly.
     /// </summary>
     public enum BeginFeedbackMode : int
     {
@@ -25469,7 +25469,7 @@ namespace OpenTK.Graphics.OpenGL4
     /// <summary>
     /// Used in GL.GetShaderPrecisionFormat
     /// </summary>
-    public enum ShaderPrecisionType : int
+    public enum ShaderPrecision : int
     {
         /// <summary>
         /// Original was GL_LOW_FLOAT = 0x8DF0
@@ -27217,6 +27217,25 @@ namespace OpenTK.Graphics.OpenGL4
         SeparateAttribs = ((int)0x8C8D)        ,
     }
 
+    /// <summary>
+    /// Used in GL.BeginTransformFeedback
+    /// </summary>
+    public enum TransformFeedbackPrimitiveType : int
+    {
+        /// <summary>
+        /// Original was GL_POINTS = 0x0000
+        /// </summary>
+        Points = ((int)0x0000)        ,
+        /// <summary>
+        /// Original was GL_LINES = 0x0001
+        /// </summary>
+        Lines = ((int)0x0001)        ,
+        /// <summary>
+        /// Original was GL_TRIANGLES = 0x0004
+        /// </summary>
+        Triangles = ((int)0x0004)        ,
+    }
+
     /// <summary>
     /// Used in GL.BindTransformFeedback
     /// </summary>
@@ -27228,6 +27247,149 @@ namespace OpenTK.Graphics.OpenGL4
         TransformFeedback = ((int)0x8E22)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetTransformFeedbackVarying
+    /// </summary>
+    public enum TransformFeedbackType : int
+    {
+        /// <summary>
+        /// Original was GL_INT = 0x1404
+        /// </summary>
+        Int = ((int)0x1404)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = ((int)0x1405)        ,
+        /// <summary>
+        /// Original was GL_FLOAT = 0x1406
+        /// </summary>
+        Float = ((int)0x1406)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE = 0x140A
+        /// </summary>
+        Double = ((int)0x140A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
+        /// </summary>
+        FloatVec2 = ((int)0x8B50)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
+        /// </summary>
+        FloatVec3 = ((int)0x8B51)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
+        /// </summary>
+        FloatVec4 = ((int)0x8B52)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC2 = 0x8B53
+        /// </summary>
+        IntVec2 = ((int)0x8B53)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC3 = 0x8B54
+        /// </summary>
+        IntVec3 = ((int)0x8B54)        ,
+        /// <summary>
+        /// Original was GL_INT_VEC4 = 0x8B55
+        /// </summary>
+        IntVec4 = ((int)0x8B55)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
+        /// </summary>
+        FloatMat2 = ((int)0x8B5A)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
+        /// </summary>
+        FloatMat3 = ((int)0x8B5B)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
+        /// </summary>
+        FloatMat4 = ((int)0x8B5C)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = ((int)0x8B65)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = ((int)0x8B66)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
+        /// </summary>
+        FloatMat3x2 = ((int)0x8B67)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = ((int)0x8B68)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = ((int)0x8B69)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = ((int)0x8B6A)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = ((int)0x8DC6)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = ((int)0x8DC7)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = ((int)0x8DC8)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2 = 0x8F46
+        /// </summary>
+        DoubleMat2 = ((int)0x8F46)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3 = 0x8F47
+        /// </summary>
+        DoubleMat3 = ((int)0x8F47)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4 = 0x8F48
+        /// </summary>
+        DoubleMat4 = ((int)0x8F48)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x3 = 0x8F49
+        /// </summary>
+        DoubleMat2x3 = ((int)0x8F49)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x4 = 0x8F4A
+        /// </summary>
+        DoubleMat2x4 = ((int)0x8F4A)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x2 = 0x8F4B
+        /// </summary>
+        DoubleMat3x2 = ((int)0x8F4B)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x4 = 0x8F4C
+        /// </summary>
+        DoubleMat3x4 = ((int)0x8F4C)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x2 = 0x8F4D
+        /// </summary>
+        DoubleMat4x2 = ((int)0x8F4D)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x3 = 0x8F4E
+        /// </summary>
+        DoubleMat4x3 = ((int)0x8F4E)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC2 = 0x8FFC
+        /// </summary>
+        DoubleVec2 = ((int)0x8FFC)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC3 = 0x8FFD
+        /// </summary>
+        DoubleVec3 = ((int)0x8FFD)        ,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC4 = 0x8FFE
+        /// </summary>
+        DoubleVec4 = ((int)0x8FFE)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>