From 58c12d0d0533fe82db6b830aacee9a35d7ac2995 Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Fri, 23 Oct 2009 15:32:43 +0000
Subject: [PATCH] GetAttribLocation: name parameter should have a flow of in,
 not out. Fixed a number of signatures that were different from desktop
 OpenGL.

---
 Source/Bind/Specifications/ES20/overrides.xml |  76 ++++++----
 Source/OpenTK/Graphics/ES20/Core.cs           |  22 +--
 Source/OpenTK/Graphics/ES20/Delegates.cs      |  22 +--
 Source/OpenTK/Graphics/ES20/ES.cs             | 136 +++++++++---------
 Source/OpenTK/Graphics/ES20/Enums.cs          |  80 +++++------
 5 files changed, 174 insertions(+), 162 deletions(-)

diff --git a/Source/Bind/Specifications/ES20/overrides.xml b/Source/Bind/Specifications/ES20/overrides.xml
index 7c8ebb29..759572a4 100644
--- a/Source/Bind/Specifications/ES20/overrides.xml
+++ b/Source/Bind/Specifications/ES20/overrides.xml
@@ -17,24 +17,24 @@
     </function>
     
     <function name="BlendEquation" extension="Core" version="2.0">
-      <param name="mode"><type>BlendMode</type></param>
+      <param name="mode"><type>BlendEquationMode</type></param>
     </function>
      
     <function name="BlendEquationSeparate" extension="Core" version="2.0">
-      <param name="modeRGB"><type>BlendMode</type></param>
-      <param name="modeAlpha"><type>BlendMode</type></param>
+      <param name="modeRGB"><type>BlendEquationMode</type></param>
+      <param name="modeAlpha"><type>BlendEquationMode</type></param>
     </function>
 
     <function name="BlendFunc" extension="Core" version="2.0">
-      <param name="sfactor"><type>BlendFactor</type></param>
-      <param name="dfactor"><type>BlendFactor</type></param>
+      <param name="sfactor"><type>BlendingFactorSrc</type></param>
+      <param name="dfactor"><type>BlendingFactorDst</type></param>
     </function>
      
     <function name="BlendFuncSeparate" extension="Core" version="2.0">
-      <param name="srcRGB"><type>BlendFactor</type></param>
-      <param name="dstRGB"><type>BlendFactor</type></param>
-      <param name="srcAlpha"><type>BlendFactor</type></param>
-      <param name="dstAlpha"><type>BlendFactor</type></param>
+      <param name="srcRGB"><type>BlendingFactorSrc</type></param>
+      <param name="dstRGB"><type>BlendingFactorDst</type></param>
+      <param name="srcAlpha"><type>BlendingFactorSrc</type></param>
+      <param name="dstAlpha"><type>BlendingFactorDst</type></param>
     </function>
 
     <function name="BindBuffer" extension="Core" version="2.0">
@@ -51,7 +51,7 @@
     </function>
 
     <function name="VertexAttribPointer" extension="Core" version="2.0">
-      <param name="type"><type>VertexAttribType</type></param>
+      <param name="type"><type>VertexAttribPointerType</type></param>
     </function>
 
     <function name="Hint" extension="Core" version="2.0">
@@ -73,16 +73,16 @@
     </function>
      
     <function name="StencilOp" extension="Core" version="2.0">
-      <param name="fail"><type>StencilOperation</type></param>
-      <param name="zfail"><type>StencilOperation</type></param>
-      <param name="zpass"><type>StencilOperation</type></param>
+      <param name="fail"><type>StencilOp</type></param>
+      <param name="zfail"><type>StencilOp</type></param>
+      <param name="zpass"><type>StencilOp</type></param>
     </function>
      
     <function name="StencilOpSeparate" extension="Core" version="2.0">
       <param name="face"><type>CullFaceMode</type></param>
-      <param name="fail"><type>StencilOperation</type></param>
-      <param name="zfail"><type>StencilOperation</type></param>
-      <param name="zpass"><type>StencilOperation</type></param>
+      <param name="fail"><type>StencilOp</type></param>
+      <param name="zfail"><type>StencilOp</type></param>
+      <param name="zpass"><type>StencilOp</type></param>
     </function>  
 
     <function name="GetBufferParameter" extension="Core" version="2.0">
@@ -112,11 +112,11 @@
     </function>
      
     <function name="DrawArrays" extension="Core" version="2.0">
-      <param name="mode"><type>PrimitiveMode</type></param>
+      <param name="mode"><type>BeginMode</type></param>
     </function>
      
     <function name="DrawElements" extension="Core" version="2.0">
-      <param name="mode"><type>PrimitiveMode</type></param>
+      <param name="mode"><type>BeginMode</type></param>
       <param name="type"><type>DrawElementsType</type></param>
     </function>
 
@@ -165,7 +165,7 @@
     </function>
      
     <function name="GetVertexAttribPointer" extension="Core" version="2.0">
-      <param name="pname"><type>VertexAttribPointerType</type></param> 
+      <param name="pname"><type>VertexAttribPointerParameter</type></param> 
     </function>
       
     <function name="ActiveTexture" extension="Core" version="2.0">
@@ -287,18 +287,22 @@
     <function name="GetError" extension="Core">
       <returns>ErrorCode</returns>
     </function>
-  
+
+    <function name="GetAttribLocation" extension="Core">
+      <param name="name"><flow>in</flow></param>
+    </function>
+    
   </replace>
 
   <add> 
 
-    <enum name="BlendMode">
+    <enum name="BlendEquationMode">
       <token name="FuncAdd" value="0X8006" />
       <token name="FuncSubtract" value="0X800a" />
       <token name="FuncReverseSubtract" value="0X800b" />
     </enum>
      
-    <enum name="BlendFactor">
+    <enum name="BlendingFactorSrc">
       <token name="Zero" value="0" />
       <token name="One" value="1" />
       <token name="SrcColor" value="0X0300" />
@@ -315,7 +319,25 @@
       <token name="OneMinusConstantAlpha" value="0X8004" />
       <token name="SrcAlphaSaturate" value="0X0308" remark="only valid for source RGB/Alpha" />
     </enum>
-     
+
+    <enum name="BlendingFactorDst">
+      <token name="Zero" value="0" />
+      <token name="One" value="1" />
+      <token name="SrcColor" value="0X0300" />
+      <token name="OneMinusSrcColor" value="0X0301" />
+      <token name="DstColor" value="0X0306" />
+      <token name="OneMinusDstColor" value="0X0307" />
+      <token name="SrcAlpha" value="0X0302" />
+      <token name="OneMinusSrcAlpha" value="0X0303" />
+      <token name="DstAlpha" value="0X0304" />
+      <token name="OneMinusDstAlpha" value="0X0305" />
+      <token name="ConstantColor" value="0X8001" />
+      <token name="OneMinusConstantColor" value="0X8002" />
+      <token name="ConstantAlpha" value="0X8003" />
+      <token name="OneMinusConstantAlpha" value="0X8004" />
+      <token name="SrcAlphaSaturate" value="0X0308" remark="only valid for source RGB/Alpha" />
+    </enum>
+
     <enum name="BufferTarget">
       <token name="ArrayBuffer" value="0X8892" />
       <token name="ElementArrayBuffer" value="0X8893" />
@@ -332,7 +354,7 @@
       <token name="BufferUsage" value="0X8765" />
     </enum>
      
-    <enum name="VertexAttribType">
+    <enum name="VertexAttribPointerType">
       <token name="Byte" value="0X1400" />
       <token name="UnsignedByte" value="0X1401" />
       <token name="Short" value="0X1402" />
@@ -378,7 +400,7 @@
       <token name="Always" value="0X0207" />
     </enum>
 
-    <enum name="PrimitiveMode">
+    <enum name="BeginMode">
       <token name="Points" value="0X0000" />
       <token name="Lines" value="0X0001" />
       <token name="LineLoop" value="0X0002" />
@@ -488,7 +510,7 @@
       <token name="CurrentVertexAttrib" value="0X8626" />
     </enum>
      
-    <enum name="VertexAttribPointerType">
+    <enum name="VertexAttribPointerParameter">
       <token name="VertexAttribArrayPointer" value="0X8645" />
     </enum>
      
@@ -513,7 +535,7 @@
       <token name="Always" value="0X0207" />
     </enum>
      
-    <enum name="StencilOperation">
+    <enum name="StencilOp">
       <token name="Invert" value="0X150a" />
       <token name="Keep" value="0X1e00" />
       <token name="Replace" value="0X1e01" />
diff --git a/Source/OpenTK/Graphics/ES20/Core.cs b/Source/OpenTK/Graphics/ES20/Core.cs
index 0e2c8bcb..e87af039 100644
--- a/Source/OpenTK/Graphics/ES20/Core.cs
+++ b/Source/OpenTK/Graphics/ES20/Core.cs
@@ -67,16 +67,16 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BlendColor(Single red, Single green, Single blue, Single alpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquation", ExactSpelling = true)]
-            internal extern static void BlendEquation(OpenTK.Graphics.ES20.BlendMode mode);
+            internal extern static void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationSeparate", ExactSpelling = true)]
-            internal extern static void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendMode modeRGB, OpenTK.Graphics.ES20.BlendMode modeAlpha);
+            internal extern static void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunc", ExactSpelling = true)]
-            internal extern static void BlendFunc(OpenTK.Graphics.ES20.BlendFactor sfactor, OpenTK.Graphics.ES20.BlendFactor dfactor);
+            internal extern static void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendFactor srcRGB, OpenTK.Graphics.ES20.BlendFactor dstRGB, OpenTK.Graphics.ES20.BlendFactor srcAlpha, OpenTK.Graphics.ES20.BlendFactor dstAlpha);
+            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha);
             [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);
@@ -181,10 +181,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static void DisableVertexAttribArray(UInt32 index);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawArrays", ExactSpelling = true)]
-            internal extern static void DrawArrays(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 first, Int32 count);
+            internal extern static void DrawArrays(OpenTK.Graphics.ES20.BeginMode mode, Int32 first, Int32 count);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawElements", ExactSpelling = true)]
-            internal extern static void DrawElements(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
+            internal extern static void DrawElements(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEGLImageTargetRenderbufferStorageOES", ExactSpelling = true)]
             internal extern static void EGLImageTargetRenderbufferStorageOES(OpenTK.Graphics.ES20.All target, IntPtr image);
@@ -256,7 +256,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetAttachedShaders(UInt32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetAttribLocation", ExactSpelling = true)]
-            internal extern static int GetAttribLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name);
+            internal extern static int GetAttribLocation(UInt32 program, String name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetBooleanv", ExactSpelling = true)]
             internal extern static unsafe void GetBooleanv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] bool* @params);
@@ -355,7 +355,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetVertexAttribiv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribPointerv", ExactSpelling = true)]
-            internal extern static void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer);
+            internal extern static void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glHint", ExactSpelling = true)]
             internal extern static void Hint(OpenTK.Graphics.ES20.HintTarget target, OpenTK.Graphics.ES20.HintMode mode);
@@ -442,10 +442,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static void StencilMaskSeparate(OpenTK.Graphics.ES20.CullFaceMode face, UInt32 mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOp", ExactSpelling = true)]
-            internal extern static void StencilOp(OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass);
+            internal extern static void StencilOp(OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilOpSeparate", ExactSpelling = true)]
-            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass);
+            internal extern static void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTestFenceNV", ExactSpelling = true)]
             internal extern static bool TestFenceNV(UInt32 fence);
@@ -565,7 +565,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void VertexAttrib4fv(UInt32 indx, Single* values);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glVertexAttribPointer", ExactSpelling = true)]
-            internal extern static void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, IntPtr ptr);
+            internal extern static void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glViewport", ExactSpelling = true)]
             internal extern static void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
diff --git a/Source/OpenTK/Graphics/ES20/Delegates.cs b/Source/OpenTK/Graphics/ES20/Delegates.cs
index a9105f75..094cf9d2 100644
--- a/Source/OpenTK/Graphics/ES20/Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/Delegates.cs
@@ -65,16 +65,16 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BlendColor(Single red, Single green, Single blue, Single alpha);
             internal static BlendColor glBlendColor;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquation(OpenTK.Graphics.ES20.BlendMode mode);
+            internal delegate void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode);
             internal static BlendEquation glBlendEquation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendMode modeRGB, OpenTK.Graphics.ES20.BlendMode modeAlpha);
+            internal delegate void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
             internal static BlendEquationSeparate glBlendEquationSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFunc(OpenTK.Graphics.ES20.BlendFactor sfactor, OpenTK.Graphics.ES20.BlendFactor dfactor);
+            internal delegate void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor);
             internal static BlendFunc glBlendFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendFactor srcRGB, OpenTK.Graphics.ES20.BlendFactor dstRGB, OpenTK.Graphics.ES20.BlendFactor srcAlpha, OpenTK.Graphics.ES20.BlendFactor dstAlpha);
+            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha);
             internal static BlendFuncSeparate glBlendFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
@@ -179,10 +179,10 @@ namespace OpenTK.Graphics.ES20
             internal delegate void DisableVertexAttribArray(UInt32 index);
             internal static DisableVertexAttribArray glDisableVertexAttribArray;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DrawArrays(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 first, Int32 count);
+            internal delegate void DrawArrays(OpenTK.Graphics.ES20.BeginMode mode, Int32 first, Int32 count);
             internal static DrawArrays glDrawArrays;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DrawElements(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
+            internal delegate void DrawElements(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
             internal static DrawElements glDrawElements;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EGLImageTargetRenderbufferStorageOES(OpenTK.Graphics.ES20.All target, IntPtr image);
@@ -254,7 +254,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetAttachedShaders(UInt32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders);
             internal unsafe static GetAttachedShaders glGetAttachedShaders;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate int GetAttribLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name);
+            internal delegate int GetAttribLocation(UInt32 program, String name);
             internal static GetAttribLocation glGetAttribLocation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetBooleanv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] bool* @params);
@@ -353,7 +353,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetVertexAttribiv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params);
             internal unsafe static GetVertexAttribiv glGetVertexAttribiv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer);
+            internal delegate void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer);
             internal static GetVertexAttribPointerv glGetVertexAttribPointerv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Hint(OpenTK.Graphics.ES20.HintTarget target, OpenTK.Graphics.ES20.HintMode mode);
@@ -440,10 +440,10 @@ namespace OpenTK.Graphics.ES20
             internal delegate void StencilMaskSeparate(OpenTK.Graphics.ES20.CullFaceMode face, UInt32 mask);
             internal static StencilMaskSeparate glStencilMaskSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilOp(OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass);
+            internal delegate void StencilOp(OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             internal static StencilOp glStencilOp;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass);
+            internal delegate void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass);
             internal static StencilOpSeparate glStencilOpSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate bool TestFenceNV(UInt32 fence);
@@ -563,7 +563,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void VertexAttrib4fv(UInt32 indx, Single* values);
             internal unsafe static VertexAttrib4fv glVertexAttrib4fv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, IntPtr ptr);
+            internal delegate void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr);
             internal static VertexAttribPointer glVertexAttribPointer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
diff --git a/Source/OpenTK/Graphics/ES20/ES.cs b/Source/OpenTK/Graphics/ES20/ES.cs
index dfaacbe4..48d8305f 100644
--- a/Source/OpenTK/Graphics/ES20/ES.cs
+++ b/Source/OpenTK/Graphics/ES20/ES.cs
@@ -1603,13 +1603,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendEquation")]
         public static 
-        void BlendEquation(OpenTK.Graphics.ES20.BlendMode mode)
+        void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquation((OpenTK.Graphics.ES20.BlendMode)mode);
+            Delegates.glBlendEquation((OpenTK.Graphics.ES20.BlendEquationMode)mode);
             #if DEBUG
             }
             #endif
@@ -1631,13 +1631,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendEquationSeparate")]
         public static 
-        void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendMode modeRGB, OpenTK.Graphics.ES20.BlendMode modeAlpha)
+        void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendEquationSeparate((OpenTK.Graphics.ES20.BlendMode)modeRGB, (OpenTK.Graphics.ES20.BlendMode)modeAlpha);
+            Delegates.glBlendEquationSeparate((OpenTK.Graphics.ES20.BlendEquationMode)modeRGB, (OpenTK.Graphics.ES20.BlendEquationMode)modeAlpha);
             #if DEBUG
             }
             #endif
@@ -1659,13 +1659,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendFunc")]
         public static 
-        void BlendFunc(OpenTK.Graphics.ES20.BlendFactor sfactor, OpenTK.Graphics.ES20.BlendFactor dfactor)
+        void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFunc((OpenTK.Graphics.ES20.BlendFactor)sfactor, (OpenTK.Graphics.ES20.BlendFactor)dfactor);
+            Delegates.glBlendFunc((OpenTK.Graphics.ES20.BlendingFactorSrc)sfactor, (OpenTK.Graphics.ES20.BlendingFactorDst)dfactor);
             #if DEBUG
             }
             #endif
@@ -1697,13 +1697,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendFuncSeparate")]
         public static 
-        void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendFactor srcRGB, OpenTK.Graphics.ES20.BlendFactor dstRGB, OpenTK.Graphics.ES20.BlendFactor srcAlpha, OpenTK.Graphics.ES20.BlendFactor dstAlpha)
+        void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.BlendFactor)srcRGB, (OpenTK.Graphics.ES20.BlendFactor)dstRGB, (OpenTK.Graphics.ES20.BlendFactor)srcAlpha, (OpenTK.Graphics.ES20.BlendFactor)dstAlpha);
+            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.ES20.BlendingFactorDst)dstRGB, (OpenTK.Graphics.ES20.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.ES20.BlendingFactorDst)dstAlpha);
             #if DEBUG
             }
             #endif
@@ -4122,13 +4122,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawArrays")]
         public static 
-        void DrawArrays(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 first, Int32 count)
+        void DrawArrays(OpenTK.Graphics.ES20.BeginMode mode, Int32 first, Int32 count)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawArrays((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)first, (Int32)count);
+            Delegates.glDrawArrays((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)first, (Int32)count);
             #if DEBUG
             }
             #endif
@@ -4160,7 +4160,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4170,7 +4170,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElements((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
                 indices = (T3)indices_ptr.Target;
             }
             finally
@@ -4208,7 +4208,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4218,7 +4218,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElements((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4255,7 +4255,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4265,7 +4265,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElements((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4302,7 +4302,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4312,7 +4312,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElements((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4349,13 +4349,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements(OpenTK.Graphics.ES20.PrimitiveMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices)
+        void DrawElements(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawElements((OpenTK.Graphics.ES20.PrimitiveMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices);
+            Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices);
             #if DEBUG
             }
             #endif
@@ -6215,13 +6215,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetAttribLocation")]
         public static 
-        int GetAttribLocation(Int32 program, [OutAttribute] System.Text.StringBuilder name)
+        int GetAttribLocation(Int32 program, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetAttribLocation((UInt32)program, (System.Text.StringBuilder)name);
+            return Delegates.glGetAttribLocation((UInt32)program, (String)name);
             #if DEBUG
             }
             #endif
@@ -6244,13 +6244,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetAttribLocation")]
         public static 
-        int GetAttribLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name)
+        int GetAttribLocation(UInt32 program, String name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetAttribLocation((UInt32)program, (System.Text.StringBuilder)name);
+            return Delegates.glGetAttribLocation((UInt32)program, (String)name);
             #if DEBUG
             }
             #endif
@@ -9423,7 +9423,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] ref T2 pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9433,7 +9433,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                 pointer = (T2)pointer_ptr.Target;
             }
             finally
@@ -9466,7 +9466,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9476,7 +9476,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9508,7 +9508,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,] pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9518,7 +9518,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9550,7 +9550,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9560,7 +9560,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9592,13 +9592,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer)
+        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer);
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -9626,7 +9626,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] ref T2 pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9636,7 +9636,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                 pointer = (T2)pointer_ptr.Target;
             }
             finally
@@ -9670,7 +9670,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9680,7 +9680,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9713,7 +9713,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,] pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9723,7 +9723,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9756,7 +9756,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9766,7 +9766,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -9799,13 +9799,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer)
+        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerType)pname, (IntPtr)pointer);
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -11877,13 +11877,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glStencilOp")]
         public static 
-        void StencilOp(OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass)
+        void StencilOp(OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilOp((OpenTK.Graphics.ES20.StencilOperation)fail, (OpenTK.Graphics.ES20.StencilOperation)zfail, (OpenTK.Graphics.ES20.StencilOperation)zpass);
+            Delegates.glStencilOp((OpenTK.Graphics.ES20.StencilOp)fail, (OpenTK.Graphics.ES20.StencilOp)zfail, (OpenTK.Graphics.ES20.StencilOp)zpass);
             #if DEBUG
             }
             #endif
@@ -11915,13 +11915,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glStencilOpSeparate")]
         public static 
-        void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOperation fail, OpenTK.Graphics.ES20.StencilOperation zfail, OpenTK.Graphics.ES20.StencilOperation zpass)
+        void StencilOpSeparate(OpenTK.Graphics.ES20.CullFaceMode face, OpenTK.Graphics.ES20.StencilOp fail, OpenTK.Graphics.ES20.StencilOp zfail, OpenTK.Graphics.ES20.StencilOp zpass)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES20.CullFaceMode)face, (OpenTK.Graphics.ES20.StencilOperation)fail, (OpenTK.Graphics.ES20.StencilOperation)zfail, (OpenTK.Graphics.ES20.StencilOperation)zpass);
+            Delegates.glStencilOpSeparate((OpenTK.Graphics.ES20.CullFaceMode)face, (OpenTK.Graphics.ES20.StencilOp)fail, (OpenTK.Graphics.ES20.StencilOp)zfail, (OpenTK.Graphics.ES20.StencilOp)zpass);
             #if DEBUG
             }
             #endif
@@ -15047,7 +15047,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15057,7 +15057,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
                 ptr = (T5)ptr_ptr.Target;
             }
             finally
@@ -15105,7 +15105,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15115,7 +15115,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15162,7 +15162,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,] ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15172,7 +15172,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15219,7 +15219,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15229,7 +15229,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15276,13 +15276,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, IntPtr ptr)
+        void VertexAttribPointer(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
+            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
             #if DEBUG
             }
             #endif
@@ -15325,7 +15325,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15335,7 +15335,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
                 ptr = (T5)ptr_ptr.Target;
             }
             finally
@@ -15384,7 +15384,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15394,7 +15394,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15442,7 +15442,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,] ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15452,7 +15452,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15500,7 +15500,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15510,7 +15510,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -15558,13 +15558,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribType type, bool normalized, Int32 stride, IntPtr ptr)
+        void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
+            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/ES20/Enums.cs b/Source/OpenTK/Graphics/ES20/Enums.cs
index 8c1ac03e..ea8e3178 100644
--- a/Source/OpenTK/Graphics/ES20/Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/Enums.cs
@@ -514,6 +514,13 @@ namespace OpenTK.Graphics.ES20
         TriangleFan = ((int)0x0006),
     }
 
+    public enum BlendEquationMode : int
+    {
+        FuncAdd = ((int)0X8006),
+        FuncSubtract = ((int)0X800a),
+        FuncReverseSubtract = ((int)0X800b),
+    }
+
     public enum BlendEquationSeparate : int
     {
         FuncAdd = ((int)0x8006),
@@ -521,7 +528,19 @@ namespace OpenTK.Graphics.ES20
         BlendEquationAlpha = ((int)0x883D),
     }
 
-    public enum BlendFactor : int
+    public enum BlendingFactorDest : int
+    {
+        Zero = ((int)0),
+        SrcColor = ((int)0x0300),
+        OneMinusSrcColor = ((int)0x0301),
+        SrcAlpha = ((int)0x0302),
+        OneMinusSrcAlpha = ((int)0x0303),
+        DstAlpha = ((int)0x0304),
+        OneMinusDstAlpha = ((int)0x0305),
+        One = ((int)1),
+    }
+
+    public enum BlendingFactorDst : int
     {
         Zero = ((int)0),
         SrcColor = ((int)0X0300),
@@ -540,30 +559,23 @@ namespace OpenTK.Graphics.ES20
         One = ((int)1),
     }
 
-    public enum BlendingFactorDest : int
-    {
-        Zero = ((int)0),
-        SrcColor = ((int)0x0300),
-        OneMinusSrcColor = ((int)0x0301),
-        SrcAlpha = ((int)0x0302),
-        OneMinusSrcAlpha = ((int)0x0303),
-        DstAlpha = ((int)0x0304),
-        OneMinusDstAlpha = ((int)0x0305),
-        One = ((int)1),
-    }
-
     public enum BlendingFactorSrc : int
     {
+        Zero = ((int)0),
+        SrcColor = ((int)0X0300),
+        OneMinusSrcColor = ((int)0X0301),
+        SrcAlpha = ((int)0X0302),
+        OneMinusSrcAlpha = ((int)0X0303),
+        DstAlpha = ((int)0X0304),
+        OneMinusDstAlpha = ((int)0X0305),
         DstColor = ((int)0x0306),
         OneMinusDstColor = ((int)0x0307),
         SrcAlphaSaturate = ((int)0x0308),
-    }
-
-    public enum BlendMode : int
-    {
-        FuncAdd = ((int)0X8006),
-        FuncSubtract = ((int)0X800a),
-        FuncReverseSubtract = ((int)0X800b),
+        ConstantColor = ((int)0X8001),
+        OneMinusConstantColor = ((int)0X8002),
+        ConstantAlpha = ((int)0X8003),
+        OneMinusConstantAlpha = ((int)0X8004),
+        One = ((int)1),
     }
 
     public enum BlendSubtract : int
@@ -1106,17 +1118,6 @@ namespace OpenTK.Graphics.ES20
         UnsignedShort565 = ((int)0x8363),
     }
 
-    public enum PrimitiveMode : int
-    {
-        Points = ((int)0X0000),
-        Lines = ((int)0X0001),
-        LineLoop = ((int)0X0002),
-        LineStrip = ((int)0X0003),
-        Triangles = ((int)0X0004),
-        TriangleStrip = ((int)0X0005),
-        TriangleFan = ((int)0X0006),
-    }
-
     public enum ProgramParameter : int
     {
         DeleteStatus = ((int)0X8b80),
@@ -1278,6 +1279,7 @@ namespace OpenTK.Graphics.ES20
 
     public enum StencilOp : int
     {
+        Zero = ((int)0X0000),
         Invert = ((int)0x150A),
         Keep = ((int)0x1E00),
         Replace = ((int)0x1E01),
@@ -1287,18 +1289,6 @@ namespace OpenTK.Graphics.ES20
         DecrWrap = ((int)0x8508),
     }
 
-    public enum StencilOperation : int
-    {
-        Zero = ((int)0X0000),
-        Invert = ((int)0X150a),
-        Keep = ((int)0X1e00),
-        Replace = ((int)0X1e01),
-        Incr = ((int)0X1e02),
-        Decr = ((int)0X1e03),
-        IncrWrap = ((int)0X8507),
-        DecrWrap = ((int)0X8508),
-    }
-
     public enum StringName : int
     {
         Vendor = ((int)0x1F00),
@@ -1432,12 +1422,12 @@ namespace OpenTK.Graphics.ES20
         VertexAttribArrayBufferBinding = ((int)0X889f),
     }
 
-    public enum VertexAttribPointerType : int
+    public enum VertexAttribPointerParameter : int
     {
         VertexAttribArrayPointer = ((int)0X8645),
     }
 
-    public enum VertexAttribType : int
+    public enum VertexAttribPointerType : int
     {
         Byte = ((int)0X1400),
         UnsignedByte = ((int)0X1401),