diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 8837ad13..70776765 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -1720,6 +1720,45 @@
       <param name="drawcount" type="GLsizei" flow="in" />
       <returns type="void" />
     </function>
+    <!--
+    <function name="TexImage1D" category="VERSION_1_0" extension="Core" version="1.0">
+      <param name="target" type="TextureTarget" flow="in" />
+      <param name="level" type="CheckedInt32" flow="in" />
+      <param name="internalformat" type="PixelInternalFormat" flow="in" />
+      <param name="width" type="GLsizei" flow="in" />
+      <param name="border" type="CheckedInt32" flow="in" />
+      <param name="format" type="PixelFormat" flow="in" />
+      <param name="type" type="PixelType" flow="in" />
+      <param name="pixels" type="void *" flow="in" count="COMPSIZE(format,type,width)" />
+      <returns type="void" />
+    </function>
+    <function name="TexImage2D" category="VERSION_1_0" extension="Core" version="1.0">
+      <param name="target" type="TextureTarget" flow="in" />
+      <param name="level" type="CheckedInt32" flow="in" />
+      <param name="internalformat" type="PixelInternalFormat" flow="in" />
+      <param name="width" type="GLsizei" flow="in" />
+      <param name="height" type="GLsizei" flow="in" />
+      <param name="border" type="CheckedInt32" flow="in" />
+      <param name="format" type="PixelFormat" flow="in" />
+      <param name="type" type="PixelType" flow="in" />
+      <param name="pixels" type="void *" flow="in" count="COMPSIZE(format,type,width,height)" />
+      <returns type="void" />
+    </function>
+    <function name="TexImage3D" category="VERSION_1_2" extension="Core" version="1.2">
+      <param name="target" type="TextureTarget" flow="in" />
+      <param name="level" type="CheckedInt32" flow="in" />
+      <param name="internalformat" type="PixelInternalFormat" flow="in" />
+      <param name="width" type="GLsizei" flow="in" />
+      <param name="height" type="GLsizei" flow="in" />
+      <param name="depth" type="GLsizei" flow="in" />
+      <param name="border" type="CheckedInt32" flow="in" />
+      <param name="format" type="PixelFormat" flow="in" />
+      <param name="type" type="PixelType" flow="in" />
+      <param name="pixels" type="void *" flow="in" count="COMPSIZE(format,type,width,height,depth)" />
+      <returns type="void" />
+    </function>
+    -->
+
   </add>
 
   <add name="gl|glcore">
@@ -4115,7 +4154,7 @@
   </add>
   
   <!-- gles2 2.0 -->
-  <replace name="gles2">
+  <replace name="gles2" version="2.0">
   
     <function name="BindBuffer" extension="Core" version="2.0">
       <param name="target"><type>BufferTarget</type></param>
@@ -4403,7 +4442,7 @@
 
   </replace>
   
-  <add name="gles2">
+  <add name="gles2" version="2.0">
     <!-- PrimtiveType <=> BeginMode overloads for backwards compatibility -->
     <function name="DrawArrays" category="ES_VERSION_2_0" extension="Core" version="2.0">
       <param name="mode" type="BeginMode" flow="in" />
@@ -5160,10 +5199,35 @@
     </function>
     
     <!-- Program Queries [6.1.12] -->
-    <function name="GetProgram" extension="Core" version="2.0">
+    <function name="GetProgram">
       <param name="pname"><type>ProgramParameter</type></param>
     </function>
     
+    <!-- Texturing [3.8] -->
+    <function name="ActiveTexture">
+      <param name="texture"><type>TextureUnit</type></param>
+    </function>
+    <function name="BindTexture">
+      <param name="target"><type>TextureTarget</type></param>
+    </function>
+    
+    <!-- Sampler Objects [3.8.2] -->
+    <function name="SamplerParameter">
+      <param name="pname"><type>SamplerParameterName</type></param>
+    </function>
+
+    <!-- Sampler Queries [6.1.5] -->
+    <function name="GetSamplerParameter">
+      <param name="pname"><type>SamplerParameterName</type></param>
+    </function>
+
+    <!-- Texture Image Specification [3.8.3-4] -->
+    <function name="TexImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+      <param name="internalformat"><type>PixelFormat</type></param>
+      <param name="format"><type>PixelFormat</type></param>
+    </function>
+    
    </replace>
   
   <add name="gles2" version="3.0">
@@ -5332,14 +5396,37 @@
       <use token="CURRENT_QUERY" />
     </enum>
     <enum name="PixelFormat">
+      <use token="ALPHA" />
       <use token="RGBA" />
+      <use token="RGB" />
+      <use token="RG" />
+      <use token="R" />
       <use token="RGBA_INTEGER" />
+      <use token="RGB_INTEGER" />
+      <use token="RG_INTEGER" />
+      <use token="R_INTEGER" />
+	  <use token="DEPTH_COMPONENT" />
+	  <use token="DEPTH_STENCIL" />
+	  <use token="LUMINANCE_ALPHA" />
+	  <use token="LUMINANCE" />
     </enum>
     <enum name="PixelType">
+      <use token="BYTE" />
+      <use token="SHORT" />
       <use token="INT" />
-      <use token="UNSIGNED_INT_2_10_10_10_REV" />
       <use token="UNSIGNED_BYTE" />
+      <use token="UNSIGNED_SHORT" />
       <use token="UNSIGNED_INT" />
+      <use token="FLOAT" />
+      <use token="HALF_FLOAT" />
+      <use token="UNSIGNED_SHORT_4_4_4_4" />
+      <use token="UNSIGNED_SHORT_5_5_5_1" />
+      <use token="UNSIGNED_SHORT_5_6_5" />
+      <use token="UNSIGNED_INT_2_10_10_10_REV" />
+      <use token="UNSIGNED_INT_24_8" />
+      <use token="UNSIGNED_INT_10F_11F_11F_REV" />
+      <use token="UNSIGNED_INT_5_9_9_9_REV" />
+      <use token="FLOAT_32_UNSIGNED_INT_24_8_REV" />
     </enum>
     <enum name="ProgramParameter">
       <use token="DELETE_STATUS" />
@@ -5383,6 +5470,17 @@
       <use token="COLOR_ATTACHMENT14" />
       <use token="COLOR_ATTACHMENT15" />
     </enum>
+    <enum name="SamplerParameterName">
+      <use token="TEXTURE_WRAP_S" />
+      <use token="TEXTURE_WRAP_T" />
+      <use token="TEXTURE_WRAP_R" />
+      <use token="TEXTURE_MIN_FILTER" />
+      <use token="TEXTURE_MAG_FILTER" />
+      <use token="TEXTURE_MIN_LOD" />
+      <use token="TEXTURE_MAX_LOD" />
+      <use token="TEXTURE_COMPARE_MODE" />
+      <use token="TEXTURE_COMPARE_FUNC" />
+    </enum>
     <enum name="ShaderParameter">
       <use token="ShaderType" />
       <use token="DeleteStatus" />
@@ -5402,6 +5500,111 @@
       <use token="VERTEX_SHADER" />
       <use token="FRAGMENT_SHADER" />
     </enum>
+    <enum name="TextureComponentCount">
+      <use token="R8" />
+      <use token="R8I" />
+      <use token="R8UI" />
+      <use token="R8_SNORM" />
+      <use token="R16I" />
+      <use token="R16UI" />
+      <use token="R16F" />
+      <use token="R32I" />
+      <use token="R32UI" />
+      <use token="R32F" />
+      <use token="RG8" />
+      <use token="RG8I" />
+      <use token="RG8UI" />
+      <use token="RG8_SNORM" />
+      <use token="RG16I" />
+      <use token="RG16UI" />
+      <use token="RG16F" />
+      <use token="RG32I" />
+      <use token="RG32UI" />
+      <use token="RG32F" />
+      <use token="RGB" />
+      <use token="RGB5_A1" />
+      <use token="RGB565" />
+      <use token="RGB8" />
+      <use token="RGB8I" />
+      <use token="RGB8UI" />
+      <use token="RGB8_SNORM" />
+      <use token="RGB9_E5" />
+      <use token="RGB10_A2" />
+      <use token="RGB10_A2UI" />
+      <use token="RGB16I" />
+      <use token="RGB16UI" />
+      <use token="RGB16F" />
+      <use token="RGB32I" />
+      <use token="RGB32UI" />
+      <use token="RGB32F" />
+      <use token="SRGB8" />
+      <use token="RGBA" />
+      <use token="RGBA4" />
+      <use token="RGBA8" />
+      <use token="RGBA8I" />
+      <use token="RGBA8UI" />
+      <use token="RGBA8_SNORM" />
+      <use token="RGBA16I" />
+      <use token="RGBA16UI" />
+      <use token="RGBA16F" />
+      <use token="RGBA32I" />
+      <use token="RGBA32UI" />
+      <use token="RGBA32F" />
+      <use token="SRGB8_ALPHA8" />
+      <use token="R11F_G11F_B10F" />
+      <use token="DEPTH_COMPONENT16" />
+      <use token="DEPTH_COMPONENT24" />
+      <use token="DEPTH_COMPONENT32F" />
+      <use token="DEPTH24_STENCIL8" />
+      <use token="DEPTH32F_STENCIL8" />
+      <use token="LUMINANCE_ALPHA" />
+      <use token="LUMINANCE" />
+      <use token="ALPHA" />
+    </enum>
+    <enum name="TextureTarget">
+      <use token="TEXTURE_2D" />
+      <use token="TEXTURE_3D" />
+      <use token="TEXTURE_2D_ARRAY" />
+      <use token="TEXTURE_CUBE_MAP" />
+    </enum>
+    <enum name="TextureTarget3d">
+      <use token="TEXTURE_3D" />
+      <use token="TEXTURE_2D_ARRAY" />
+    </enum>
+    <enum name="TextureUnit">
+      <use token="TEXTURE0" />
+      <use token="TEXTURE1" />
+      <use token="TEXTURE2" />
+      <use token="TEXTURE3" />
+      <use token="TEXTURE4" />
+      <use token="TEXTURE5" />
+      <use token="TEXTURE6" />
+      <use token="TEXTURE7" />
+      <use token="TEXTURE8" />
+      <use token="TEXTURE9" />
+      <use token="TEXTURE10" />
+      <use token="TEXTURE11" />
+      <use token="TEXTURE12" />
+      <use token="TEXTURE13" />
+      <use token="TEXTURE14" />
+      <use token="TEXTURE15" />
+      <use token="TEXTURE16" />
+      <use token="TEXTURE17" />
+      <use token="TEXTURE18" />
+      <use token="TEXTURE19" />
+      <use token="TEXTURE20" />
+      <use token="TEXTURE21" />
+      <use token="TEXTURE22" />
+      <use token="TEXTURE23" />
+      <use token="TEXTURE24" />
+      <use token="TEXTURE25" />
+      <use token="TEXTURE26" />
+      <use token="TEXTURE27" />
+      <use token="TEXTURE28" />
+      <use token="TEXTURE29" />
+      <use token="TEXTURE30" />
+      <use token="TEXTURE31" />
+    </enum>
     <enum name="TransformFeedbackMode">
       <use token="INTERLEAVED_ATTRIBS" />
       <use token="SEPARATE_ATTRIBS" />
diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs
index de567769..295ad813 100644
--- a/Source/OpenTK/Graphics/ES20/ES20.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20.cs
@@ -1267,13 +1267,52 @@ 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, Int32 mask, OpenTK.Graphics.ES20.All 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, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
+                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+                    /// <summary>[requires: ANGLE_framebuffer_blit]
+                    /// Copy a block of pixels from the read framebuffer to the draw framebuffer
+                    /// </summary>
+                    /// <param name="srcX0">
+                    /// <para>
+                    /// Specify the bounds of the source rectangle within the read buffer of the read framebuffer.
+                    /// </para>
+                    /// </param>
+                    /// <param name="dstX0">
+                    /// <para>
+                    /// Specify the bounds of the destination rectangle within the write buffer of the write framebuffer.
+                    /// </para>
+                    /// </param>
+                    /// <param name="mask">
+                    /// <para>
+                    /// The bitwise OR of the flags indicating which buffers are to be copied. The allowed flags are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT and GL_STENCIL_BUFFER_BIT.
+                    /// </para>
+                    /// </param>
+                    /// <param name="filter">
+                    /// <para>
+                    /// Specifies the interpolation to be applied if the image is stretched. Must be GL_NEAREST or GL_LINEAR.
+                    /// </para>
+                    /// </param>
+            [System.CLSCompliant(false)]
+            [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, UInt32 mask, OpenTK.Graphics.ES20.All 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, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
                 #if DEBUG
                 }
                 #endif
@@ -21573,13 +21612,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glBeginQueryEXT")]
             public static 
-            void BeginQuery(OpenTK.Graphics.ES20.QueryTarget target, Int32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.All target, Int32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.All)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -21602,13 +21641,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(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.All target, UInt32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.All)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -22655,13 +22694,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(OpenTK.Graphics.ES20.QueryTarget target)
+            void EndQuery(OpenTK.Graphics.ES20.All target)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glEndQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target);
+                Delegates.glEndQueryEXT((OpenTK.Graphics.ES20.All)target);
                 #if DEBUG
                 }
                 #endif
@@ -22688,13 +22727,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glFlushMappedBufferRangeEXT")]
             public static 
-            void FlushMappedBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length)
+            void FlushMappedBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glFlushMappedBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length);
+                Delegates.glFlushMappedBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length);
                 #if DEBUG
                 }
                 #endif
@@ -24279,7 +24318,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(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32[] @params)
+            void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24289,7 +24328,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24300,7 +24339,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(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] out Int32 @params)
+            void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24310,7 +24349,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24323,13 +24362,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(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params);
+                Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24356,7 +24395,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24366,7 +24405,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24395,7 +24434,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24405,7 +24444,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24436,13 +24475,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24470,7 +24509,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24480,7 +24519,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24510,7 +24549,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24520,7 +24559,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24551,13 +24590,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24584,7 +24623,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24594,7 +24633,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24623,7 +24662,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24633,7 +24672,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24664,13 +24703,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24698,7 +24737,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24708,7 +24747,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24738,7 +24777,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24748,7 +24787,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24779,13 +24818,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24813,7 +24852,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24823,7 +24862,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24853,7 +24892,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out UInt64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24863,7 +24902,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24894,13 +24933,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params);
+                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24928,7 +24967,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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24938,7 +24977,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24968,7 +25007,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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out UInt32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24978,7 +25017,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -25009,13 +25048,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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params);
+                Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -25187,13 +25226,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glMapBufferRangeEXT")]
             public static 
-            IntPtr MapBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, Int32 access)
+            IntPtr MapBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, Int32 access)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
+                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
                 #if DEBUG
                 }
                 #endif
@@ -25226,13 +25265,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glMapBufferRangeEXT")]
             public static 
-            IntPtr MapBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access)
+            IntPtr MapBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
+                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
                 #if DEBUG
                 }
                 #endif
@@ -26224,13 +26263,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value)
+            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -26258,13 +26297,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.ProgramParameterName pname, Int32 value)
+            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -34920,13 +34959,52 @@ 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, Int32 mask, OpenTK.Graphics.ES20.All 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, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
+                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+                    /// <summary>[requires: NV_framebuffer_blit]
+                    /// Copy a block of pixels from the read framebuffer to the draw framebuffer
+                    /// </summary>
+                    /// <param name="srcX0">
+                    /// <para>
+                    /// Specify the bounds of the source rectangle within the read buffer of the read framebuffer.
+                    /// </para>
+                    /// </param>
+                    /// <param name="dstX0">
+                    /// <para>
+                    /// Specify the bounds of the destination rectangle within the write buffer of the write framebuffer.
+                    /// </para>
+                    /// </param>
+                    /// <param name="mask">
+                    /// <para>
+                    /// The bitwise OR of the flags indicating which buffers are to be copied. The allowed flags are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT and GL_STENCIL_BUFFER_BIT.
+                    /// </para>
+                    /// </param>
+                    /// <param name="filter">
+                    /// <para>
+                    /// Specifies the interpolation to be applied if the image is stretched. Must be GL_NEAREST or GL_LINEAR.
+                    /// </para>
+                    /// </param>
+            [System.CLSCompliant(false)]
+            [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, UInt32 mask, OpenTK.Graphics.ES20.All 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, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
                 #if DEBUG
                 }
                 #endif
@@ -37641,13 +37719,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, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params)
+            void GetBufferPointer(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params);
+                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params);
                 #if DEBUG
                 }
                 #endif
@@ -37656,7 +37734,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, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37666,7 +37744,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37680,7 +37758,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, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37690,7 +37768,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37704,7 +37782,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, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37714,7 +37792,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37728,7 +37806,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, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T2 @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37738,7 +37816,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                     @params = (T2)@params_ptr.Target;
                 }
                 finally
@@ -40758,13 +40836,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glUnmapBufferOES")]
             public static 
-            bool UnmapBuffer(OpenTK.Graphics.ES20.BufferTarget target)
+            bool UnmapBuffer(OpenTK.Graphics.ES20.All target)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glUnmapBufferOES((OpenTK.Graphics.ES20.BufferTarget)target);
+                return Delegates.glUnmapBufferOES((OpenTK.Graphics.ES20.All)target);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/ES20/ES20Core.cs b/Source/OpenTK/Graphics/ES20/ES20Core.cs
index 700912e6..e6388d3f 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(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
+            internal extern static void BeginQueryEXT(OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
+            internal extern static void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
+            internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All 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(OpenTK.Graphics.ES20.QueryTarget target);
+            internal extern static void EndQueryEXT(OpenTK.Graphics.ES20.All target);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndTilingQCOM", ExactSpelling = true)]
             internal extern static void EndTilingQCOM(UInt32 preserveMask);
@@ -380,7 +380,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void Flush();
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFlushMappedBufferRangeEXT", ExactSpelling = true)]
-            internal extern static void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length);
+            internal extern static void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFramebufferRenderbuffer", ExactSpelling = true)]
             internal extern static void FramebufferRenderbuffer(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.RenderbufferTarget renderbuffertarget, UInt32 renderbuffer);
@@ -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, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
+            internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All 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(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryivEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
+            internal extern static unsafe void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
+            internal extern static unsafe void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.All 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);
@@ -665,7 +665,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static IntPtr MapBufferOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All access);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBufferRangeEXT", ExactSpelling = true)]
-            internal extern static IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access);
+            internal extern static IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMultiDrawArraysEXT", ExactSpelling = true)]
             internal extern static unsafe void MultiDrawArraysEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* first, Int32* count, Int32 primcount);
@@ -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.ProgramParameterName pname, Int32 value);
+            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All 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);
@@ -1013,7 +1013,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void UniformMatrix4x3fvNV(Int32 location, Int32 count, bool transpose, Single* value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUnmapBufferOES", ExactSpelling = true)]
-            internal extern static bool UnmapBufferOES(OpenTK.Graphics.ES20.BufferTarget target);
+            internal extern static bool UnmapBufferOES(OpenTK.Graphics.ES20.All target);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUseProgram", ExactSpelling = true)]
             internal extern static void UseProgram(UInt32 program);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
index 1c3dbaf0..63a05158 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(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
+            internal delegate void BeginQueryEXT(OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
+            internal delegate void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All 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, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
+            internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All 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(OpenTK.Graphics.ES20.QueryTarget target);
+            internal delegate void EndQueryEXT(OpenTK.Graphics.ES20.All target);
             internal static EndQueryEXT glEndQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndTilingQCOM(UInt32 preserveMask);
@@ -378,7 +378,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void Flush();
             internal static Flush glFlush;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length);
+            internal delegate void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length);
             internal static FlushMappedBufferRangeEXT glFlushMappedBufferRangeEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void FramebufferRenderbuffer(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.RenderbufferTarget renderbuffertarget, UInt32 renderbuffer);
@@ -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, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
+            internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All 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(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryivEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryivEXT glGetQueryivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params);
             internal unsafe static GetQueryObjecti64vEXT glGetQueryObjecti64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryObjectivEXT glGetQueryObjectivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
+            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64* @params);
             internal unsafe static GetQueryObjectui64vEXT glGetQueryObjectui64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
+            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.All 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);
@@ -663,7 +663,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate IntPtr MapBufferOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All access);
             internal static MapBufferOES glMapBufferOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access);
+            internal delegate IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access);
             internal static MapBufferRangeEXT glMapBufferRangeEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void MultiDrawArraysEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* first, Int32* count, Int32 primcount);
@@ -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.ProgramParameterName pname, Int32 value);
+            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value);
             internal static ProgramParameteriEXT glProgramParameteriEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
@@ -1011,7 +1011,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void UniformMatrix4x3fvNV(Int32 location, Int32 count, bool transpose, Single* value);
             internal unsafe static UniformMatrix4x3fvNV glUniformMatrix4x3fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate bool UnmapBufferOES(OpenTK.Graphics.ES20.BufferTarget target);
+            internal delegate bool UnmapBufferOES(OpenTK.Graphics.ES20.All target);
             internal static UnmapBufferOES glUnmapBufferOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void UseProgram(UInt32 program);
diff --git a/Source/OpenTK/Graphics/ES20/ES20Enums.cs b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
index 278a9376..1687332a 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 69 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 80 other functions
     /// </summary>
     public enum All : int
     {
@@ -8141,7 +8141,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Angle.BlitFramebuffer, GL.NV.BlitFramebuffer
+    /// Not used directly.
     /// </summary>
     public enum BlitFramebufferFilter : int
     {
@@ -8186,14 +8186,14 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Oes.GetBufferPointer
+    /// Not used directly.
     /// </summary>
     public enum BufferPointer : int
     {
     }
 
     /// <summary>
-    /// Used in GL.BindBuffer, GL.BufferData and 6 other functions
+    /// Used in GL.BindBuffer, GL.BufferData and 2 other functions
     /// </summary>
     public enum BufferTarget : int
     {
@@ -8227,7 +8227,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Angle.BlitFramebuffer, GL.Clear and 1 other function
+    /// Used in GL.Clear
     /// </summary>
     [Flags]
     public enum ClearBufferMask : int
@@ -13857,14 +13857,14 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Ext.GetQueryObject
+    /// Not used directly.
     /// </summary>
     public enum GetQueryObjectParam : int
     {
     }
 
     /// <summary>
-    /// Used in GL.Ext.GetQuery
+    /// Not used directly.
     /// </summary>
     public enum GetQueryParam : int
     {
@@ -18442,7 +18442,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Ext.ProgramParameter
+    /// Not used directly.
     /// </summary>
     public enum ProgramParameterName : int
     {
@@ -18749,7 +18749,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Ext.BeginQuery, GL.Ext.EndQuery and 1 other function
+    /// Not used directly.
     /// </summary>
     public enum QueryTarget : int
     {
diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs
index 7450cd34..dc03b392 100644
--- a/Source/OpenTK/Graphics/ES30/ES30.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30.cs
@@ -3320,13 +3320,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsage usage)
+        void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsageHint usage)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.ES30.BufferUsage)usage);
+            Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.ES30.BufferUsageHint)usage);
             #if DEBUG
             }
             #endif
@@ -3358,7 +3358,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.ES30.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.ES30.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3368,7 +3368,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsageHint)usage);
             }
             finally
             {
@@ -3405,7 +3405,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,] data, OpenTK.Graphics.ES30.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,] data, OpenTK.Graphics.ES30.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3415,7 +3415,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsageHint)usage);
             }
             finally
             {
@@ -3452,7 +3452,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.ES30.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.ES30.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3462,7 +3462,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsageHint)usage);
             }
             finally
             {
@@ -3499,7 +3499,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.ES30.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.ES30.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3509,7 +3509,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES30.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES30.BufferUsageHint)usage);
                 data = (T2)data_ptr.Target;
             }
             finally
@@ -18513,7 +18513,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18523,7 +18523,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -18552,7 +18552,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18562,7 +18562,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -18593,13 +18593,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -18627,7 +18627,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18637,7 +18637,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -18667,7 +18667,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Single @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18677,7 +18677,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params_ptr);
+                    Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -18708,13 +18708,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameterfv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)@params);
+            Delegates.glGetSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -18741,7 +18741,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18751,7 +18751,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -18780,7 +18780,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18790,7 +18790,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -18821,13 +18821,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -18855,7 +18855,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32[] @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18865,7 +18865,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -18895,7 +18895,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] out Int32 @params)
+        void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18905,7 +18905,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params_ptr);
+                    Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -18936,13 +18936,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGetSamplerParameteriv")]
         public static 
-        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params)
+        unsafe void GetSamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)@params);
+            Delegates.glGetSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -24625,13 +24625,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Single param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -24664,13 +24664,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterf")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single)param);
+            Delegates.glSamplerParameterf((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -24702,7 +24702,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Single[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24712,7 +24712,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -24747,13 +24747,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Single* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -24786,7 +24786,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterfv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24796,7 +24796,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Single* param_ptr = param)
                 {
-                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)param_ptr);
+                    Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)param_ptr);
                 }
             }
             #if DEBUG
@@ -24831,13 +24831,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameterfv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Single*)param);
+            Delegates.glSamplerParameterfv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Single*)param);
             #if DEBUG
             }
             #endif
@@ -24869,13 +24869,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Int32 param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -24908,13 +24908,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteri")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32 param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32)param);
+            Delegates.glSamplerParameteri((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -24946,7 +24946,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Int32[] param)
+        void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24956,7 +24956,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -24991,13 +24991,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.All pname, Int32* param)
+        unsafe void SamplerParameter(Int32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -25030,7 +25030,7 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteriv")]
         public static 
-        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32[] param)
+        void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32[] param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -25040,7 +25040,7 @@ namespace OpenTK.Graphics.ES30
             {
                 fixed (Int32* param_ptr = param)
                 {
-                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)param_ptr);
+                    Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)param_ptr);
                 }
             }
             #if DEBUG
@@ -25075,13 +25075,13 @@ namespace OpenTK.Graphics.ES30
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glSamplerParameteriv")]
         public static 
-        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32* param)
+        unsafe void SamplerParameter(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32* param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.All)pname, (Int32*)param);
+            Delegates.glSamplerParameteriv((UInt32)sampler, (OpenTK.Graphics.ES30.SamplerParameterName)pname, (Int32*)param);
             #if DEBUG
             }
             #endif
@@ -27750,13 +27750,13 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels)
+        void TexImage3D(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels);
+            Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -27818,7 +27818,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -27828,7 +27828,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -27895,7 +27895,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[,] pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[,] pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -27905,7 +27905,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -27972,7 +27972,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -27982,7 +27982,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -28049,7 +28049,7 @@ namespace OpenTK.Graphics.ES30
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -28059,7 +28059,7 @@ namespace OpenTK.Graphics.ES30
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage3D((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 pixels = (T9)pixels_ptr.Target;
             }
             finally
@@ -53439,13 +53439,13 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, IntPtr pixels)
+            void TexImage3D(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.All)target, (Int32)level, (OpenTK.Graphics.ES30.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.All)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels);
+                Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -53507,7 +53507,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[] pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -53517,7 +53517,7 @@ namespace OpenTK.Graphics.ES30
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.All)target, (Int32)level, (OpenTK.Graphics.ES30.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.All)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -53584,7 +53584,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[,] pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -53594,7 +53594,7 @@ namespace OpenTK.Graphics.ES30
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.All)target, (Int32)level, (OpenTK.Graphics.ES30.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.All)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -53661,7 +53661,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -53671,7 +53671,7 @@ namespace OpenTK.Graphics.ES30
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.All)target, (Int32)level, (OpenTK.Graphics.ES30.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.All)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -53738,7 +53738,7 @@ namespace OpenTK.Graphics.ES30
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] ref T9 pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, [InAttribute, OutAttribute] ref T9 pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -53748,7 +53748,7 @@ namespace OpenTK.Graphics.ES30
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.All)target, (Int32)level, (OpenTK.Graphics.ES30.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.All)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES30.TextureTarget3d)target, (Int32)level, (OpenTK.Graphics.ES30.PixelFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES30.PixelFormat)format, (OpenTK.Graphics.ES30.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                     pixels = (T9)pixels_ptr.Target;
                 }
                 finally
diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
index b2d13681..4ab28d96 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs
@@ -135,7 +135,7 @@ namespace OpenTK.Graphics.ES30
             internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES30.ClearBufferMask mask, OpenTK.Graphics.ES30.BlitFramebufferFilter filter);
             internal static BlitFramebufferNV glBlitFramebufferNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsage usage);
+            internal delegate void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsageHint usage);
             internal static BufferData glBufferData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BufferSubData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data);
@@ -708,10 +708,10 @@ namespace OpenTK.Graphics.ES30
             internal unsafe delegate void GetRenderbufferParameteriv(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetRenderbufferParameteriv glGetRenderbufferParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single* @params);
+            internal unsafe delegate void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single* @params);
             internal unsafe static GetSamplerParameterfv glGetSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetSamplerParameteriv glGetSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetShaderInfoLog(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
@@ -1071,16 +1071,16 @@ namespace OpenTK.Graphics.ES30
             internal delegate void SampleCoverage(Single value, bool invert);
             internal static SampleCoverage glSampleCoverage;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single param);
+            internal delegate void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single param);
             internal static SamplerParameterf glSamplerParameterf;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single* param);
+            internal unsafe delegate void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single* param);
             internal unsafe static SamplerParameterfv glSamplerParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32 param);
+            internal delegate void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32 param);
             internal static SamplerParameteri glSamplerParameteri;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32* param);
+            internal unsafe delegate void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32* param);
             internal unsafe static SamplerParameteriv glSamplerParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Scissor(Int32 x, Int32 y, Int32 width, Int32 height);
@@ -1125,10 +1125,10 @@ namespace OpenTK.Graphics.ES30
             internal delegate void TexImage2D(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, OpenTK.Graphics.ES30.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
             internal static TexImage2D glTexImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexImage3D(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
+            internal delegate void TexImage3D(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
             internal static TexImage3D glTexImage3D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexImage3DOES(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, IntPtr pixels);
+            internal delegate void TexImage3DOES(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, IntPtr pixels);
             internal static TexImage3DOES glTexImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexParameterf(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.TextureParameterName pname, Single param);
diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
index 8d707c4c..a6cb3508 100644
--- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs
+++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs
@@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 88 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 86 other functions
     /// </summary>
     public enum All : int
     {
@@ -9601,7 +9601,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BufferData
+    /// Not used directly.
     /// </summary>
     public enum BufferUsage : int
     {
@@ -9620,7 +9620,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.BufferData
     /// </summary>
     public enum BufferUsageHint : int
     {
@@ -20191,7 +20191,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.CompressedTexSubImage2D, GL.CompressedTexSubImage3D and 5 other functions
+    /// Used in GL.CompressedTexSubImage2D, GL.CompressedTexSubImage3D and 6 other functions
     /// </summary>
     public enum PixelFormat : int
     {
@@ -20252,6 +20252,10 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         LuminanceAlpha = ((int)0x190A)        ,
         /// <summary>
+        /// Original was GL_R = 0x2002
+        /// </summary>
+        R = ((int)0x2002)        ,
+        /// <summary>
         /// Original was GL_ABGR_EXT = 0x8000
         /// </summary>
         AbgrExt = ((int)0x8000)        ,
@@ -20272,6 +20276,22 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Ycrcb444Sgix = ((int)0x81BC)        ,
         /// <summary>
+        /// Original was GL_RG = 0x8227
+        /// </summary>
+        Rg = ((int)0x8227)        ,
+        /// <summary>
+        /// Original was GL_RG_INTEGER = 0x8228
+        /// </summary>
+        RgInteger = ((int)0x8228)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_STENCIL = 0x84F9
+        /// </summary>
+        DepthStencil = ((int)0x84F9)        ,
+        /// <summary>
+        /// Original was GL_RGB_INTEGER = 0x8D98
+        /// </summary>
+        RgbInteger = ((int)0x8D98)        ,
+        /// <summary>
         /// Original was GL_RGBA_INTEGER = 0x8D99
         /// </summary>
         RgbaInteger = ((int)0x8D99)        ,
@@ -20835,6 +20855,10 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         Float = ((int)0x1406)        ,
         /// <summary>
+        /// Original was GL_HALF_FLOAT = 0x140B
+        /// </summary>
+        HalfFloat = ((int)0x140B)        ,
+        /// <summary>
         /// Original was GL_BITMAP = 0x1A00
         /// </summary>
         Bitmap = ((int)0x1A00)        ,
@@ -20879,13 +20903,29 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         UnsignedInt1010102Ext = ((int)0x8036)        ,
         /// <summary>
-        /// Original was GL_UnsignedShort565 = 0X8363
+        /// Original was GL_UNSIGNED_SHORT_5_6_5 = 0x8363
         /// </summary>
-        UnsignedShort565 = ((int)0X8363)        ,
+        UnsignedShort565 = ((int)0x8363)        ,
         /// <summary>
         /// Original was GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368
         /// </summary>
         UnsignedInt2101010Rev = ((int)0x8368)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_24_8 = 0x84FA
+        /// </summary>
+        UnsignedInt248 = ((int)0x84FA)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B
+        /// </summary>
+        UnsignedInt10F11F11FRev = ((int)0x8C3B)        ,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_5_9_9_9_REV = 0x8C3E
+        /// </summary>
+        UnsignedInt5999Rev = ((int)0x8C3E)        ,
+        /// <summary>
+        /// Original was GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD
+        /// </summary>
+        Float32UnsignedInt248Rev = ((int)0x8DAD)        ,
     }
 
     /// <summary>
@@ -21756,6 +21796,49 @@ namespace OpenTK.Graphics.ES30
         Gl4Pass3Sgis = ((int)0x80A7)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetSamplerParameter, GL.SamplerParameter
+    /// </summary>
+    public enum SamplerParameterName : int
+    {
+        /// <summary>
+        /// Original was GL_TEXTURE_MAG_FILTER = 0x2800
+        /// </summary>
+        TextureMagFilter = ((int)0x2800)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_MIN_FILTER = 0x2801
+        /// </summary>
+        TextureMinFilter = ((int)0x2801)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_WRAP_S = 0x2802
+        /// </summary>
+        TextureWrapS = ((int)0x2802)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_WRAP_T = 0x2803
+        /// </summary>
+        TextureWrapT = ((int)0x2803)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_WRAP_R = 0x8072
+        /// </summary>
+        TextureWrapR = ((int)0x8072)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_MIN_LOD = 0x813A
+        /// </summary>
+        TextureMinLod = ((int)0x813A)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_MAX_LOD = 0x813B
+        /// </summary>
+        TextureMaxLod = ((int)0x813B)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPARE_MODE = 0x884C
+        /// </summary>
+        TextureCompareMode = ((int)0x884C)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPARE_FUNC = 0x884D
+        /// </summary>
+        TextureCompareFunc = ((int)0x884D)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -21994,6 +22077,249 @@ namespace OpenTK.Graphics.ES30
         Double = ((int)0x140A)        ,
     }
 
+    /// <summary>
+    /// Not used directly.
+    /// </summary>
+    public enum TextureComponentCount : int
+    {
+        /// <summary>
+        /// Original was GL_ALPHA = 0X1906
+        /// </summary>
+        Alpha = ((int)0X1906)        ,
+        /// <summary>
+        /// Original was GL_RGB = 0X1907
+        /// </summary>
+        Rgb = ((int)0X1907)        ,
+        /// <summary>
+        /// Original was GL_RGBA = 0X1908
+        /// </summary>
+        Rgba = ((int)0X1908)        ,
+        /// <summary>
+        /// Original was GL_LUMINANCE = 0X1909
+        /// </summary>
+        Luminance = ((int)0X1909)        ,
+        /// <summary>
+        /// Original was GL_LUMINANCE_ALPHA = 0x190A
+        /// </summary>
+        LuminanceAlpha = ((int)0x190A)        ,
+        /// <summary>
+        /// Original was GL_RGB8 = 0x8051
+        /// </summary>
+        Rgb8 = ((int)0x8051)        ,
+        /// <summary>
+        /// Original was GL_RGBA4 = 0X8056
+        /// </summary>
+        Rgba4 = ((int)0X8056)        ,
+        /// <summary>
+        /// Original was GL_RGB5_A1 = 0x8057
+        /// </summary>
+        Rgb5A1 = ((int)0x8057)        ,
+        /// <summary>
+        /// Original was GL_RGBA8 = 0x8058
+        /// </summary>
+        Rgba8 = ((int)0x8058)        ,
+        /// <summary>
+        /// Original was GL_RGB10_A2 = 0x8059
+        /// </summary>
+        Rgb10A2 = ((int)0x8059)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_COMPONENT16 = 0x81A5
+        /// </summary>
+        DepthComponent16 = ((int)0x81A5)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_COMPONENT24 = 0x81A6
+        /// </summary>
+        DepthComponent24 = ((int)0x81A6)        ,
+        /// <summary>
+        /// Original was GL_R8 = 0x8229
+        /// </summary>
+        R8 = ((int)0x8229)        ,
+        /// <summary>
+        /// Original was GL_RG8 = 0x822B
+        /// </summary>
+        Rg8 = ((int)0x822B)        ,
+        /// <summary>
+        /// Original was GL_R16F = 0x822D
+        /// </summary>
+        R16f = ((int)0x822D)        ,
+        /// <summary>
+        /// Original was GL_R32F = 0x822E
+        /// </summary>
+        R32f = ((int)0x822E)        ,
+        /// <summary>
+        /// Original was GL_RG16F = 0x822F
+        /// </summary>
+        Rg16f = ((int)0x822F)        ,
+        /// <summary>
+        /// Original was GL_RG32F = 0x8230
+        /// </summary>
+        Rg32f = ((int)0x8230)        ,
+        /// <summary>
+        /// Original was GL_R8I = 0x8231
+        /// </summary>
+        R8i = ((int)0x8231)        ,
+        /// <summary>
+        /// Original was GL_R8UI = 0x8232
+        /// </summary>
+        R8ui = ((int)0x8232)        ,
+        /// <summary>
+        /// Original was GL_R16I = 0x8233
+        /// </summary>
+        R16i = ((int)0x8233)        ,
+        /// <summary>
+        /// Original was GL_R16UI = 0x8234
+        /// </summary>
+        R16ui = ((int)0x8234)        ,
+        /// <summary>
+        /// Original was GL_R32I = 0x8235
+        /// </summary>
+        R32i = ((int)0x8235)        ,
+        /// <summary>
+        /// Original was GL_R32UI = 0x8236
+        /// </summary>
+        R32ui = ((int)0x8236)        ,
+        /// <summary>
+        /// Original was GL_RG8I = 0x8237
+        /// </summary>
+        Rg8i = ((int)0x8237)        ,
+        /// <summary>
+        /// Original was GL_RG8UI = 0x8238
+        /// </summary>
+        Rg8ui = ((int)0x8238)        ,
+        /// <summary>
+        /// Original was GL_RG16I = 0x8239
+        /// </summary>
+        Rg16i = ((int)0x8239)        ,
+        /// <summary>
+        /// Original was GL_RG16UI = 0x823A
+        /// </summary>
+        Rg16ui = ((int)0x823A)        ,
+        /// <summary>
+        /// Original was GL_RG32I = 0x823B
+        /// </summary>
+        Rg32i = ((int)0x823B)        ,
+        /// <summary>
+        /// Original was GL_RG32UI = 0x823C
+        /// </summary>
+        Rg32ui = ((int)0x823C)        ,
+        /// <summary>
+        /// Original was GL_RGBA32F = 0x8814
+        /// </summary>
+        Rgba32f = ((int)0x8814)        ,
+        /// <summary>
+        /// Original was GL_RGB32F = 0x8815
+        /// </summary>
+        Rgb32f = ((int)0x8815)        ,
+        /// <summary>
+        /// Original was GL_RGBA16F = 0x881A
+        /// </summary>
+        Rgba16f = ((int)0x881A)        ,
+        /// <summary>
+        /// Original was GL_RGB16F = 0x881B
+        /// </summary>
+        Rgb16f = ((int)0x881B)        ,
+        /// <summary>
+        /// Original was GL_DEPTH24_STENCIL8 = 0x88F0
+        /// </summary>
+        Depth24Stencil8 = ((int)0x88F0)        ,
+        /// <summary>
+        /// Original was GL_R11F_G11F_B10F = 0x8C3A
+        /// </summary>
+        R11fG11fB10f = ((int)0x8C3A)        ,
+        /// <summary>
+        /// Original was GL_RGB9_E5 = 0x8C3D
+        /// </summary>
+        Rgb9E5 = ((int)0x8C3D)        ,
+        /// <summary>
+        /// Original was GL_SRGB8 = 0x8C41
+        /// </summary>
+        Srgb8 = ((int)0x8C41)        ,
+        /// <summary>
+        /// Original was GL_SRGB8_ALPHA8 = 0x8C43
+        /// </summary>
+        Srgb8Alpha8 = ((int)0x8C43)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_COMPONENT32F = 0x8CAC
+        /// </summary>
+        DepthComponent32f = ((int)0x8CAC)        ,
+        /// <summary>
+        /// Original was GL_DEPTH32F_STENCIL8 = 0x8CAD
+        /// </summary>
+        Depth32fStencil8 = ((int)0x8CAD)        ,
+        /// <summary>
+        /// Original was GL_RGB565 = 0X8d62
+        /// </summary>
+        Rgb565 = ((int)0X8d62)        ,
+        /// <summary>
+        /// Original was GL_RGBA32UI = 0x8D70
+        /// </summary>
+        Rgba32ui = ((int)0x8D70)        ,
+        /// <summary>
+        /// Original was GL_RGB32UI = 0x8D71
+        /// </summary>
+        Rgb32ui = ((int)0x8D71)        ,
+        /// <summary>
+        /// Original was GL_RGBA16UI = 0x8D76
+        /// </summary>
+        Rgba16ui = ((int)0x8D76)        ,
+        /// <summary>
+        /// Original was GL_RGB16UI = 0x8D77
+        /// </summary>
+        Rgb16ui = ((int)0x8D77)        ,
+        /// <summary>
+        /// Original was GL_RGBA8UI = 0x8D7C
+        /// </summary>
+        Rgba8ui = ((int)0x8D7C)        ,
+        /// <summary>
+        /// Original was GL_RGB8UI = 0x8D7D
+        /// </summary>
+        Rgb8ui = ((int)0x8D7D)        ,
+        /// <summary>
+        /// Original was GL_RGBA32I = 0x8D82
+        /// </summary>
+        Rgba32i = ((int)0x8D82)        ,
+        /// <summary>
+        /// Original was GL_RGB32I = 0x8D83
+        /// </summary>
+        Rgb32i = ((int)0x8D83)        ,
+        /// <summary>
+        /// Original was GL_RGBA16I = 0x8D88
+        /// </summary>
+        Rgba16i = ((int)0x8D88)        ,
+        /// <summary>
+        /// Original was GL_RGB16I = 0x8D89
+        /// </summary>
+        Rgb16i = ((int)0x8D89)        ,
+        /// <summary>
+        /// Original was GL_RGBA8I = 0x8D8E
+        /// </summary>
+        Rgba8i = ((int)0x8D8E)        ,
+        /// <summary>
+        /// Original was GL_RGB8I = 0x8D8F
+        /// </summary>
+        Rgb8i = ((int)0x8D8F)        ,
+        /// <summary>
+        /// Original was GL_R8_SNORM = 0x8F94
+        /// </summary>
+        R8Snorm = ((int)0x8F94)        ,
+        /// <summary>
+        /// Original was GL_RG8_SNORM = 0x8F95
+        /// </summary>
+        Rg8Snorm = ((int)0x8F95)        ,
+        /// <summary>
+        /// Original was GL_RGB8_SNORM = 0x8F96
+        /// </summary>
+        Rgb8Snorm = ((int)0x8F96)        ,
+        /// <summary>
+        /// Original was GL_RGBA8_SNORM = 0x8F97
+        /// </summary>
+        Rgba8Snorm = ((int)0x8F97)        ,
+        /// <summary>
+        /// Original was GL_RGB10_A2UI = 0x906F
+        /// </summary>
+        Rgb10A2ui = ((int)0x906F)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -22413,7 +22739,7 @@ namespace OpenTK.Graphics.ES30
     }
 
     /// <summary>
-    /// Used in GL.BindTexture, GL.CompressedTexImage2D and 14 other functions
+    /// Used in GL.BindTexture, GL.CompressedTexImage2D and 13 other functions
     /// </summary>
     public enum TextureTarget : int
     {
@@ -22506,9 +22832,9 @@ namespace OpenTK.Graphics.ES30
         /// </summary>
         TextureMaxLevelSgis = ((int)0x813D)        ,
         /// <summary>
-        /// Original was GL_TextureCubeMap = 0X8513
+        /// Original was GL_TEXTURE_CUBE_MAP = 0x8513
         /// </summary>
-        TextureCubeMap = ((int)0X8513)        ,
+        TextureCubeMap = ((int)0x8513)        ,
         /// <summary>
         /// Original was GL_TextureCubeMapPositiveX = 0X8515
         /// </summary>
@@ -22533,6 +22859,25 @@ namespace OpenTK.Graphics.ES30
         /// Original was GL_TextureCubeMapNegativeZ = 0X851a
         /// </summary>
         TextureCubeMapNegativeZ = ((int)0X851a)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_2D_ARRAY = 0x8C1A
+        /// </summary>
+        Texture2DArray = ((int)0x8C1A)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.TexImage3D, GL.Oes.TexImage3D
+    /// </summary>
+    public enum TextureTarget3d : int
+    {
+        /// <summary>
+        /// Original was GL_TEXTURE_3D = 0x806F
+        /// </summary>
+        Texture3D = ((int)0x806F)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_2D_ARRAY = 0x8C1A
+        /// </summary>
+        Texture2DArray = ((int)0x8C1A)        ,
     }
 
     /// <summary>
diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs
index 548158f8..d0006941 100644
--- a/Source/OpenTK/Graphics/ES30/ES3Core.cs
+++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs
@@ -137,7 +137,7 @@ namespace OpenTK.Graphics.ES30
             internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES30.ClearBufferMask mask, OpenTK.Graphics.ES30.BlitFramebufferFilter filter);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferData", ExactSpelling = true)]
-            internal extern static void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsage usage);
+            internal extern static void BufferData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES30.BufferUsageHint usage);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferSubData", ExactSpelling = true)]
             internal extern static void BufferSubData(OpenTK.Graphics.ES30.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data);
@@ -710,10 +710,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static unsafe void GetRenderbufferParameteriv(OpenTK.Graphics.ES30.RenderbufferTarget target, OpenTK.Graphics.ES30.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Single* @params);
+            internal extern static unsafe void GetSamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Single* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetSamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetShaderInfoLog", ExactSpelling = true)]
             internal extern static unsafe void GetShaderInfoLog(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog);
@@ -1073,16 +1073,16 @@ namespace OpenTK.Graphics.ES30
             internal extern static void SampleCoverage(Single value, bool invert);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterf", ExactSpelling = true)]
-            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single param);
+            internal extern static void SamplerParameterf(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameterfv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Single* param);
+            internal extern static unsafe void SamplerParameterfv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Single* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteri", ExactSpelling = true)]
-            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32 param);
+            internal extern static void SamplerParameteri(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32 param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glSamplerParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.All pname, Int32* param);
+            internal extern static unsafe void SamplerParameteriv(UInt32 sampler, OpenTK.Graphics.ES30.SamplerParameterName pname, Int32* param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glScissor", ExactSpelling = true)]
             internal extern static void Scissor(Int32 x, Int32 y, Int32 width, Int32 height);
@@ -1127,10 +1127,10 @@ namespace OpenTK.Graphics.ES30
             internal extern static void TexImage2D(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, OpenTK.Graphics.ES30.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3D", ExactSpelling = true)]
-            internal extern static void TexImage3D(OpenTK.Graphics.ES30.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
+            internal extern static void TexImage3D(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.PixelType type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3DOES", ExactSpelling = true)]
-            internal extern static void TexImage3DOES(OpenTK.Graphics.ES30.All target, Int32 level, OpenTK.Graphics.ES30.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.All format, OpenTK.Graphics.ES30.All type, IntPtr pixels);
+            internal extern static void TexImage3DOES(OpenTK.Graphics.ES30.TextureTarget3d target, Int32 level, OpenTK.Graphics.ES30.PixelFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES30.PixelFormat format, OpenTK.Graphics.ES30.All type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexParameterf", ExactSpelling = true)]
             internal extern static void TexParameterf(OpenTK.Graphics.ES30.TextureTarget target, OpenTK.Graphics.ES30.TextureParameterName pname, Single param);