diff --git a/Source/Bind/ES/ESGenerator.cs b/Source/Bind/ES/ESGenerator.cs
index b0143c77..de626bbe 100644
--- a/Source/Bind/ES/ESGenerator.cs
+++ b/Source/Bind/ES/ESGenerator.cs
@@ -131,7 +131,8 @@ namespace Bind.ES
                         {
                             Constant c = new Constant(param.GetAttribute("name", String.Empty), param.GetAttribute("value", String.Empty));
                             Utilities.Merge(all, c);
-                            e.ConstantCollection.Add(c.Name, c);
+                            try { e.ConstantCollection.Add(c.Name, c); }
+                            catch (ArgumentException ex) { Console.WriteLine("[Warning] Failed to add constant {0} to enum {1}: {2}", c.Name, e.Name, ex.Message); }
                         }
 
                         Utilities.Merge(enums, e);
diff --git a/Source/Bind/Specifications/ES20/overrides.xml b/Source/Bind/Specifications/ES20/overrides.xml
index 7ba9ed89..6d00b652 100644
--- a/Source/Bind/Specifications/ES20/overrides.xml
+++ b/Source/Bind/Specifications/ES20/overrides.xml
@@ -5,8 +5,13 @@
   
     <function name="GetString" extension="Core">
       <returns>String</returns>
+      <param name="name"><type>StringName</type></param>
     </function>
 
+    <function name="ShaderBinary" extension="Core">
+      <param name="binaryformat"><type>ShaderBinaryFormat</type></param>
+    </function>
+    
     <function name="ShaderSource" extension="Core">
       <param name="string"><type>String*</type></param>
     </function>
@@ -197,7 +202,7 @@
       <param name="format"><type>PixelFormat</type></param>
       <param name="type"><type>PixelType</type></param>
     </function>
-     
+
     <function name="CopyTexImage2D" extension="Core" version="2.0">
       <param name="target"><type>TextureTarget</type></param>
       <param name="internalformat"><type>PixelInternalFormat</type></param>
@@ -214,6 +219,7 @@
      
     <function name="CompressedTexSubImage2D" extension="Core" version="2.0">
       <param name="target"><type>TextureTarget</type></param>
+      <param name="format"><type>PixelFormat</type></param>
     </function>
      
     <function name="ReadPixels" extension="Core" version="2.0">
@@ -674,15 +680,6 @@
       <token name="UnpackAlignment" value="0X0cf5" />
     </enum>
 
-    <!--
-      According to http://www.khronos.org/opengles/sdk/docs/man/ the GetBooleanPName enum should also contain:
-      GL_BLEND
-      GL_CULL_FACE
-      GL_DEPTH_TEST
-      GL_DITHER
-      GL_POLYGON_OFFSET_FILL
-       -->
-
     <enum name="GetPName">
       <token name="ShaderCompiler" value="0X8dfa" />
       <token name="SampleCoverageInvert" value="0X80ab" />
@@ -762,8 +759,24 @@
       <token name="AlphaBits" value="0X0d55" />
       <token name="DepthBits" value="0X0d56" />
       <token name="StencilBits" value="0X0d57" />
+      <!-- From EnableCap -->
+      <token name="CullFace" value="0X0b44" />
+      <token name="DepthTest" value="0X0b71" />
+      <token name="StencilTest" value="0X0b90" />
+      <token name="Dither" value="0X0bd0" />
+      <token name="Blend" value="0X0be2" />
+      <token name="ScissorTest" value="0X0c11" />
+      <token name="Texture2D" value="0X0de1" />
+      <token name="PolygonOffsetFill" value="0X8037" />
+      <token name="SampleAlphaToCoverage" value="0X809e" />
+      <token name="SampleCoverage" value="0X80a0" />
     </enum>
-     
+
+    <enum name="ShaderBinaryFormat">
+      <!-- Note: ShaderBinaryFormat must be queried at runtime, using
+      GetInteger(GetPName.ShaderBinaryFormats) -->
+    </enum>
+    
   </add>
 
 </overrides>
diff --git a/Source/OpenTK/Graphics/ES20/Core.cs b/Source/OpenTK/Graphics/ES20/Core.cs
index 5c1716d2..0e2c8bcb 100644
--- a/Source/OpenTK/Graphics/ES20/Core.cs
+++ b/Source/OpenTK/Graphics/ES20/Core.cs
@@ -112,7 +112,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void CompressedTexImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCompressedTexSubImage2D", ExactSpelling = true)]
-            internal extern static void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
+            internal extern static void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCompressedTexSubImage3DOES", ExactSpelling = true)]
             internal extern static void CompressedTexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
@@ -331,7 +331,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] System.Text.StringBuilder source);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetString", ExactSpelling = true)]
-            internal extern static unsafe IntPtr GetString(OpenTK.Graphics.ES20.All name);
+            internal extern static unsafe IntPtr GetString(OpenTK.Graphics.ES20.StringName name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTexParameterfv", ExactSpelling = true)]
             internal extern static unsafe void GetTexParameterfv(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single* @params);
@@ -424,7 +424,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void SetFenceNV(UInt32 fence, OpenTK.Graphics.ES20.All condition);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glShaderBinary", ExactSpelling = true)]
-            internal extern static unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length);
+            internal extern static unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glShaderSource", ExactSpelling = true)]
             internal extern static unsafe void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length);
diff --git a/Source/OpenTK/Graphics/ES20/Delegates.cs b/Source/OpenTK/Graphics/ES20/Delegates.cs
index 81903154..a9105f75 100644
--- a/Source/OpenTK/Graphics/ES20/Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/Delegates.cs
@@ -110,7 +110,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void CompressedTexImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data);
             internal static CompressedTexImage3DOES glCompressedTexImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
+            internal delegate void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, IntPtr data);
             internal static CompressedTexSubImage2D glCompressedTexSubImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void CompressedTexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
@@ -329,7 +329,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] System.Text.StringBuilder source);
             internal unsafe static GetShaderSource glGetShaderSource;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate IntPtr GetString(OpenTK.Graphics.ES20.All name);
+            internal unsafe delegate IntPtr GetString(OpenTK.Graphics.ES20.StringName name);
             internal unsafe static GetString glGetString;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTexParameterfv(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single* @params);
@@ -422,7 +422,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void SetFenceNV(UInt32 fence, OpenTK.Graphics.ES20.All condition);
             internal static SetFenceNV glSetFenceNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length);
+            internal unsafe delegate void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length);
             internal unsafe static ShaderBinary glShaderBinary;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length);
diff --git a/Source/OpenTK/Graphics/ES20/ES.cs b/Source/OpenTK/Graphics/ES20/ES.cs
index 59b47152..dfaacbe4 100644
--- a/Source/OpenTK/Graphics/ES20/ES.cs
+++ b/Source/OpenTK/Graphics/ES20/ES.cs
@@ -2717,7 +2717,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
             where T8 : struct
         {
             #if DEBUG
@@ -2727,7 +2727,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 data = (T8)data_ptr.Target;
             }
             finally
@@ -2790,7 +2790,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
             where T8 : struct
         {
             #if DEBUG
@@ -2800,7 +2800,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -2862,7 +2862,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data)
             where T8 : struct
         {
             #if DEBUG
@@ -2872,7 +2872,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -2934,7 +2934,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
             where T8 : struct
         {
             #if DEBUG
@@ -2944,7 +2944,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -3006,13 +3006,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data)
+        void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, IntPtr data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data);
+            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
             #if DEBUG
             }
             #endif
@@ -8195,13 +8195,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetString")]
         public static 
-        unsafe string GetString(OpenTK.Graphics.ES20.All name)
+        unsafe string GetString(OpenTK.Graphics.ES20.StringName name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetString((OpenTK.Graphics.ES20.All)name));
+            return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetString((OpenTK.Graphics.ES20.StringName)name));
             #if DEBUG
             }
             #endif
@@ -10573,7 +10573,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10583,7 +10583,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                 binary = (T3)binary_ptr.Target;
             }
             finally
@@ -10598,7 +10598,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10608,7 +10608,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -10622,7 +10622,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10632,7 +10632,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -10646,7 +10646,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10656,7 +10656,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -10670,13 +10670,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        unsafe void ShaderBinary(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
             #if DEBUG
             }
             #endif
@@ -10684,7 +10684,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10698,7 +10698,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                         binary = (T3)binary_ptr.Target;
                     }
                     finally
@@ -10714,7 +10714,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10728,7 +10728,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10743,7 +10743,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10757,7 +10757,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10772,7 +10772,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10786,7 +10786,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10801,7 +10801,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        void ShaderBinary(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10811,7 +10811,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* shaders_ptr = shaders)
                 {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
@@ -10821,7 +10821,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10835,7 +10835,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                         binary = (T3)binary_ptr.Target;
                     }
                     finally
@@ -10851,7 +10851,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10865,7 +10865,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10880,7 +10880,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10894,7 +10894,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10909,7 +10909,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10923,7 +10923,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -10938,7 +10938,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        void ShaderBinary(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10948,7 +10948,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* shaders_ptr = &shaders)
                 {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
@@ -10959,7 +10959,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10973,7 +10973,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                         binary = (T3)binary_ptr.Target;
                     }
                     finally
@@ -10990,7 +10990,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11004,7 +11004,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11020,7 +11020,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11034,7 +11034,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11050,7 +11050,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11064,7 +11064,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11080,7 +11080,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        void ShaderBinary(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11090,7 +11090,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (UInt32* shaders_ptr = &shaders)
                 {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
@@ -11101,7 +11101,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11111,7 +11111,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                 binary = (T3)binary_ptr.Target;
             }
             finally
@@ -11126,7 +11126,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11136,7 +11136,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -11150,7 +11150,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11160,7 +11160,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -11174,7 +11174,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11184,7 +11184,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
             try
             {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
             }
             finally
             {
@@ -11198,13 +11198,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
             #if DEBUG
             }
             #endif
@@ -11213,7 +11213,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11227,7 +11227,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                         binary = (T3)binary_ptr.Target;
                     }
                     finally
@@ -11244,7 +11244,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11258,7 +11258,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11274,7 +11274,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11288,7 +11288,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11304,7 +11304,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.All binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11318,7 +11318,7 @@ namespace OpenTK.Graphics.ES20
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
                     }
                     finally
                     {
@@ -11334,7 +11334,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.All binaryformat, IntPtr binary, Int32 length)
+        void ShaderBinary(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11344,7 +11344,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (UInt32* shaders_ptr = shaders)
                 {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.All)binaryformat, (IntPtr)binary, (Int32)length);
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
diff --git a/Source/OpenTK/Graphics/ES20/Enums.cs b/Source/OpenTK/Graphics/ES20/Enums.cs
index b077feea..8c1ac03e 100644
--- a/Source/OpenTK/Graphics/ES20/Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/Enums.cs
@@ -775,12 +775,15 @@ namespace OpenTK.Graphics.ES20
     public enum GetPName : int
     {
         LineWidth = ((int)0x0B21),
+        CullFace = ((int)0X0b44),
         CullFaceMode = ((int)0x0B45),
         FrontFace = ((int)0x0B46),
         DepthRange = ((int)0x0B70),
+        DepthTest = ((int)0X0b71),
         DepthWritemask = ((int)0x0B72),
         DepthClearValue = ((int)0x0B73),
         DepthFunc = ((int)0x0B74),
+        StencilTest = ((int)0X0b90),
         StencilClearValue = ((int)0x0B91),
         StencilFunc = ((int)0x0B92),
         StencilValueMask = ((int)0x0B93),
@@ -790,7 +793,10 @@ namespace OpenTK.Graphics.ES20
         StencilRef = ((int)0x0B97),
         StencilWritemask = ((int)0x0B98),
         Viewport = ((int)0x0BA2),
+        Dither = ((int)0X0bd0),
+        Blend = ((int)0X0be2),
         ScissorBox = ((int)0x0C10),
+        ScissorTest = ((int)0X0c11),
         ColorClearValue = ((int)0x0C22),
         ColorWritemask = ((int)0x0C23),
         UnpackAlignment = ((int)0x0CF5),
@@ -804,12 +810,16 @@ namespace OpenTK.Graphics.ES20
         AlphaBits = ((int)0x0D55),
         DepthBits = ((int)0x0D56),
         StencilBits = ((int)0x0D57),
+        Texture2D = ((int)0X0de1),
         PolygonOffsetUnits = ((int)0x2A00),
         BlendColor = ((int)0X8005),
         BlendEquation = ((int)0X8009),
         BlendEquationRgb = ((int)0X8009),
+        PolygonOffsetFill = ((int)0X8037),
         PolygonOffsetFactor = ((int)0x8038),
         TextureBinding2D = ((int)0x8069),
+        SampleAlphaToCoverage = ((int)0X809e),
+        SampleCoverage = ((int)0X80a0),
         SampleBuffers = ((int)0x80A8),
         Samples = ((int)0x80A9),
         SampleCoverageValue = ((int)0x80AA),
@@ -1183,6 +1193,10 @@ namespace OpenTK.Graphics.ES20
         NumShaderBinaryFormats = ((int)0x8DF9),
     }
 
+    public enum ShaderBinaryFormat : int
+    {
+    }
+
     public enum ShaderParameter : int
     {
         ShaderType = ((int)0X8b4f),