From 735d05e496a353b73e70abfbf6f7f76f09804430 Mon Sep 17 00:00:00 2001
From: Stefanos A <stapostol@gmail.com>
Date: Thu, 7 Nov 2013 11:37:51 +0100
Subject: [PATCH] Merged ES2.0 and ES3.0 replacements

ES 3.0 includes ES 2.0 verbatim. We can significantly reduce
duplication by using the same <replace> node for both APIs. Note that
the enumerations must remain separate, as ES 2.0 and 3.0 support
different tokens.
---
 Source/Bind/Specifications/GL2/overrides.xml | 1096 +++++++-----------
 Source/OpenTK/Graphics/ES20/ES20.cs          |  895 +++++++-------
 Source/OpenTK/Graphics/ES20/ES20Core.cs      |  120 +-
 Source/OpenTK/Graphics/ES20/ES20Delegates.cs |  120 +-
 Source/OpenTK/Graphics/ES20/ES20Enums.cs     |   60 +-
 5 files changed, 956 insertions(+), 1335 deletions(-)

diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index 20d8dab8..3bb79c2e 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -4091,296 +4091,484 @@
     </enum>
   </add>
   
-  <!-- gles2 2.0 -->
-  <replace name="gles2" version="2.0">
-  
-    <function name="BindBuffer" extension="Core" version="2.0">
+  <!-- gles2 replacements for 2.0 and 3.0 -->
+  <replace name="gles2" version="2.0|3.0">
+    <!-- Buffer Objects [2.9] -->
+    <function name="BindBuffer">
       <param name="target"><type>BufferTarget</type></param>
     </function>
-  
-    <function name="GetString" extension="Core">
-      <returns>String</returns>
-      <param name="name"><type>StringName</type></param>
+    <function name="BindBufferRange">
+      <param name="target"><type>BufferRangeTarget</type></param>
     </function>
-
-    <function name="ShaderBinary" extension="Core">
+    <function name="BindBufferBase">
+      <param name="target"><type>BufferRangeTarget</type></param>
+    </function>
+    <function name="BufferData">
+      <param name="target"><type>BufferTarget</type></param>
+      <param name="usage"><type>BufferUsageHint</type></param>
+    </function>
+    <function name="BufferSubData">
+      <param name="target"><type>BufferTarget</type></param>
+    </function>
+    <function name="CopyBufferSubData">
+      <param name="readTarget"><type>BufferTarget</type></param>
+      <param name="writeTarget"><type>BufferTarget</type></param>
+    </function>
+    <function name="FlushMappedBufferRange">
+      <param name="target"><type>BufferTarget</type></param>
+    </function>
+    <function name="MapBufferRange">
+      <param name="target"><type>BufferTarget</type></param>
+      <param name="target"><type>BufferAccessMask</type></param>
+    </function> 
+    <function name="UnmapBuffer">
+      <param name="target"><type>BufferTarget</type></param>
+    </function>
+    
+    <!-- Buffer Object Queries [6.1.9] -->
+    <function name="GetBufferParameter">
+      <param name="target"><type>BufferTarget</type></param>
+      <param name="pname"><type>BufferParameterName</type></param>
+    </function>
+    <function name="GetBufferPointer">
+      <param name="target"><type>BufferTarget</type></param>
+      <param name="pname"><type>BufferPointer</type></param>
+    </function>
+    
+    <!-- Asynchronous Queries [2.13, 6.1.7] -->
+    <function name="BeginQuery">
+      <param name="target"><type>QueryTarget</type></param>
+    </function>
+    <function name="EndQuery">
+      <param name="target"><type>QueryTarget</type></param>
+    </function>
+    <function name="GetQuery">
+      <param name="target"><type>QueryTarget</type></param>
+      <param name="pname"><type>GetQueryParam</type></param>
+    </function>
+    <function name="GetQueryObject">
+      <param name="pname"><type>GetQueryObjectParam</type></param>
+    </function>
+    
+    <!-- Transform Feedback [2.14, 6.1.11] -->
+    <function name="BindTransformFeedback">
+      <param name="target"><type>TransformFeedbackTarget</type></param>
+    </function>
+    <function name="BeginTransformFeedback">
+      <param name="primitiveMode"><type>TransformFeedbackPrimitiveType</type></param>
+    </function>
+    
+    <!-- Reading and Copying Pixels [4.3.1-2] -->
+    <function name="ReadPixels">
+      <param name="format"><type>PixelFormat</type></param>
+      <param name="type"><type>PixelType</type></param>
+    </function>
+    <function name="ReadBuffer">
+      <param name="src"><type>ReadBufferMode</type></param>
+    </function>
+    <function name="BlitFramebuffer">
+      <param name="mask"><type>ClearBufferMask</type></param>
+      <param name="filter"><type>BlitFramebufferFilter</type></param>
+    </function>
+    
+    <!-- Polygons [3.6] -->
+    <function name="FrontFace">
+      <param name="dir"><type>FrontFaceDirection</type></param>
+    </function>
+    <function name="CullFace">
+      <param name="face"><type>CullFaceMode</type></param>
+    </function>
+    
+    <!-- Vertex Arrays [2.8] -->
+    <function name="VertexAttribIPointer">
+      <param name="type"><type>VertexAttribIntegerType</type></param>
+    </function>
+    
+    <!-- Drawing [2.8.3] -->
+    <function name="DrawArrays">
+      <param name="mode"><type>PrimitiveType</type></param>
+    </function>
+    <function name="DrawArraysInstanced">
+      <param name="mode"><type>PrimitiveType</type></param>
+    </function>
+    <function name="DrawElements">
+      <param name="mode"><type>PrimitiveType</type></param>
+      <param name="type"><type>DrawElementsType</type></param>
+    </function>
+    <function name="DrawElementsInstanced">
+      <param name="mode"><type>PrimitiveType</type></param>
+      <param name="type"><type>DrawElementsType</type></param>
+    </function>
+    <function name="DrawRangeElements">
+      <param name="mode"><type>PrimitiveType</type></param>
+      <param name="type"><type>DrawElementsType</type></param>
+    </function>
+    
+    <!-- Shaders and Programs [2.11.1] -->
+    <function name="CreateShader">
+      <param name="type"><type>ShaderType</type></param>
+    </function>
+    
+    <!-- Loading Shader Binaries [2.11.2] -->
+    <function name="ShaderBinary">
       <param name="binaryformat"><type>ShaderBinaryFormat</type></param>
     </function>
-    
-    <function name="ShaderSource" extension="Core">
-      <param name="length"><count>0</count></param>
+
+    <!-- Program Objects [2.11.3-4] -->
+    <function name="ProgramParameter">
+      <param name="pname"><type>ProgramParameterName</type></param>
     </function>
     
-    <function name="BlendEquation" extension="Core" version="2.0">
-      <param name="mode"><type>BlendEquationMode</type></param>
+    <!-- Program Objects [2.11.5] -->
+    <function name="GetActiveAttrib">
+      <param name="type"><type>ActiveAttribType</type></param>
     </function>
-     
-    <function name="BlendEquationSeparate" extension="Core" version="2.0">
-      <param name="modeRGB"><type>BlendEquationMode</type></param>
-      <param name="modeAlpha"><type>BlendEquationMode</type></param>
+    
+    <!-- Uniform Variables [2.11.6] -->
+    <function name="GetActiveUniform">
+      <param name="type"><type>ActiveUniformType</type></param>
+    </function>
+    <function name="GetActiveUniforms">
+      <param name="pname"><type>ActiveUniformParameter</type></param>
+    </function>
+    <function name="GetActiveUniformBlock">
+      <param name="pname"><type>ActiveUniformBlockParameter</type></param>
+    </function>
+    
+    <!-- Output Variables [2.11.8] -->
+    <function name="GetTransformFeedbackVarying">
+      <param name="type"><type>TransformFeedbackType</type></param>
+    </function>
+    <function name="TransformFeedbackVaryings">
+      <param name="bufferMode"><type>TransformFeedbackMode</type></param>
     </function>
 
-    <function name="BlendFunc" extension="Core" version="2.0">
-      <param name="sfactor"><type>BlendingFactorSrc</type></param>
-      <param name="dfactor"><type>BlendingFactorDest</type></param>
+	<!-- Shader Queries [6.1.12] -->
+    <function name="GetShader">
+      <param name="pname"><type>ShaderParameter</type></param> 
     </function>
-     
-    <function name="BlendFuncSeparate" extension="Core" version="2.0">
-      <param name="srcRGB"><type>BlendingFactorSrc</type></param>
-      <param name="dstRGB"><type>BlendingFactorDest</type></param>
-      <param name="srcAlpha"><type>BlendingFactorSrc</type></param>
-      <param name="dstAlpha"><type>BlendingFactorDest</type></param>
+    <function name="GetShaderPrecisionFormat">
+      <param name="shadertype"><type>ShaderType</type></param>
+      <param name="precisiontype"><type>ShaderPrecision</type></param>
+    </function>
+    <function name="GetVertexAttrib">
+      <param name="pname"><type>VertexAttribParameter</type></param> 
+    </function>
+    <function name="GetVertexAttribPointer">
+      <param name="pname"><type>VertexAttribPointerParameter</type></param> 
+    </function>
+    
+    <!-- Program Queries [6.1.12] -->
+    <function name="GetProgram">
+      <param name="pname"><type>ProgramParameter</type></param>
+    </function>
+    
+    <!-- Texturing [3.8] -->
+    <function name="ActiveTexture">
+      <param name="texture"><type>TextureUnit</type></param>
+    </function>
+    <function name="BindTexture">
+      <param name="target"><type>TextureTarget</type></param>
+    </function>
+    
+    <!-- Sampler Objects [3.8.2] -->
+    <function name="SamplerParameter">
+      <param name="pname"><type>SamplerParameterName</type></param>
     </function>
 
-    <function name="BufferData" extension="Core" version="2.0">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="usage"><type>BufferUsage</type></param>
-    </function>
-     
-    <function name="BufferSubData" extension="Core" version="2.0">
-      <param name="target"><type>BufferTarget</type></param>
+    <!-- Sampler Queries [6.1.5] -->
+    <function name="GetSamplerParameter">
+      <param name="pname"><type>SamplerParameterName</type></param>
     </function>
 
-    <function name="VertexAttribPointer" extension="Core" version="2.0">
-      <param name="type"><type>VertexAttribPointerType</type></param>
+    <!-- Texture Image Specification [3.8.3-4] -->
+    <function name="TexImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+      <param name="internalformat"><type>TextureComponentCount</type></param>
+      <param name="format"><type>PixelFormat</type></param>
+      <param name="type"><type>PixelType</type></param>
     </function>
-
-    <function name="Hint" extension="Core" version="2.0">
-      <param name="target"><type>HintTarget</type></param>
-      <param name="mode"><type>HintMode</type></param>
+    <function name="TexImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+      <param name="internalformat"><type>TextureComponentCount</type></param>
+      <param name="format"><type>PixelFormat</type></param>
+      <param name="type"><type>PixelType</type></param>
     </function>
+    <function name="TexStorage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+      <param name="internalformat"><type>SizedInternalFormat</type></param>
+      <param name="format"><type>PixelFormat</type></param>
+      <param name="type"><type>PixelType</type></param>
+    </function>
+    <function name="TexStorage3D">
+      <param name="target"><type>TextureTarget2d</type></param>
+      <param name="internalformat"><type>SizedInternalFormat</type></param>
+      <param name="format"><type>PixelFormat</type></param>
+      <param name="type"><type>PixelType</type></param>
+    </function>
+    
+    <!-- Alt. Texture Image Specification Commands [3.8.5] -->
+    <function name="CopyTexImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+      <param name="internalformat"><type>TextureCopyComponentCount</type></param>
+    </function>
+    <function name="TexSubImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+    </function>
+    <function name="TexSubImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+    </function>
+    <function name="CopyTexSubImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+    </function>
+    <function name="CopyTexSubImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+    </function>
+    
+    <!-- Compressed Texture Images [3.8.6] -->
+    <function name="CompressedTexImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+      <param name="internalformat"><type>CompressedInternalFormat</type></param>
+    </function>
+    <function name="CompressedTexImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+      <param name="internalformat"><type>CompressedInternalFormat</type></param>
+    </function>
+    <function name="CompressedTexSubImage2D">
+      <param name="target"><type>TextureTarget2d</type></param>
+    </function>
+    <function name="CompressedTexSubImage3D">
+      <param name="target"><type>TextureTarget3d</type></param>
+    </function>
+    
+    <!-- Texture Parameters [3.8.7] -->
+    <function name="TexParameter">
+      <param name="target"><type>TextureTarget</type></param>
+      <param name="pname"><type>TextureParameterName</type></param>
+    </function>   
+    
+     <!-- Manual Mipmap Generation [3.8.9] -->
+     <function name="GenerateMipmap">
+       <param name="target"><type>TextureTarget</type></param>
+     </function>
+      
+      <!-- Enumerated Queries [6.1.3] -->
+     <function name="GetTexParameter">
+       <param name="target"><type>TextureTarget</type></param>
+      <param name="pname"><type>GetTextureParameterName</type></param>
+     </function>
      
-    <function name="StencilFunc" extension="Core" version="2.0">
-      <param name="func"><type>StencilFunction</type></param>
+     <!-- Stencil Test [4.1.4] -->
+     <function name="StencilFunc">
+       <param name="func"><type>StencilFunction</type></param>
+     </function>
+     <function name="StencilFuncSeparate">
+       <param name="face"><type>StencilFace</type></param>
+       <param name="func"><type>StencilFunction</type></param>
+     </function>
+     <function name="StencilOp">
+      <param name="sfail"><type>StencilOp</type></param>
+      <param name="dpfail"><type>StencilOp</type></param>
+      <param name="dppass"><type>StencilOp</type></param>
     </function>
-     
-    <function name="StencilFuncSeparate" extension="Core" version="2.0">
-      <param name="face"><type>StencilFace</type></param>
-      <param name="func"><type>StencilFunction</type></param>
-    </function>
-     
-    <function name="StencilMaskSeparate" extension="Core" version="2.0">
-      <param name="face"><type>StencilFace</type></param>
-    </function>
-     
-    <function name="StencilOp" extension="Core" version="2.0">
-      <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">
+    <function name="StencilOpSeparate">
       <param name="face"><type>StencilFace</type></param>
       <param name="func"><type>StencilFunction</type></param>
       <param name="sfail"><type>StencilOp</type></param>
       <param name="dpfail"><type>StencilOp</type></param>
       <param name="dppass"><type>StencilOp</type></param>
-    </function>  
-
-    <function name="GetBufferParameter" extension="Core" version="2.0">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="pname"><type>BufferParameterName</type></param>
     </function>
-
-    <function name="Clear" extension="Core" version="2.0">
-      <param name="mask"><type>ClearBufferMask</type></param>
-    </function>
-
-    <function name="CreateShader" extension="Core" version="2.0">
-      <param name="type"><type>ShaderType</type></param>
-    </function>
-
-    <function name="GetShaderPrecisionFormat" extension="Core" version="2.0">
-      <param name="shadertype"><type>ShaderType</type></param>
-      <param name="precisiontype"><type>ShaderPrecision</type></param>
-    </function>
-
-    <function name="CullFace" extension="Core" version="2.0">
-      <param name="mode"><type>CullFaceMode</type></param>
-    </function>
-
-    <function name="DepthFunc" extension="Core" version="2.0">
+    
+    <!-- Depth Buffer Test [4.1.5] -->
+    <function name="DepthFunc">
       <param name="func"><type>DepthFunction</type></param>
     </function>
-     
-    <function name="Enable" extension="Core" version="2.0">
-      <param name="cap"><type>EnableCap</type></param>
+    
+    <!-- Blending [4.1.7] -->
+    <function name="BlendEquation">
+      <param name="mode"><type>BlendEquationMode</type></param>
     </function>
-     
-    <function name="Disable" extension="Core" version="2.0">
-      <param name="cap"><type>EnableCap</type></param>
+    <function name="BlendEquationSeparate">
+      <param name="modeRGB"><type>BlendEquationMode</type></param>
+      <param name="modeAlpha"><type>BlendEquationMode</type></param>
     </function>
-     
-    <function name="IsEnabled" extension="Core" version="2.0">
-      <param name="cap"><type>EnableCap</type></param>
+    <function name="BlendFunc">
+      <param name="sfactor"><type>BlendingFactorSrc</type></param>
+      <param name="dfactor"><type>BlendingFactorDest</type></param>
     </function>
-     
-    <function name="FrontFace" extension="Core" version="2.0">
-      <param name="mode"><type>FrontFaceDirection</type></param>
+    <function name="BlendFuncSeparate">
+      <param name="sfactorRGB"><type>BlendingFactorSrc</type></param>
+      <param name="dfactorRGB"><type>BlendingFactorDest</type></param>
+      <param name="sfactorAlpha"><type>BlendingFactorSrc</type></param>
+      <param name="dfactorAlpha"><type>BlendingFactorDest</type></param>
     </function>
-      
-    <function name="GetActiveAttrib" extension="Core" version="2.0">
-      <param name="type"><type>ActiveAttribType</type></param>
+    
+    <!-- Selecting a Buffer for Writing [4.2.1] -->
+    <function name="DrawBuffers">
+      <param name="bufs"><type>DrawBufferMode</type></param>
     </function>
-
-    <function name="GetActiveUniform" extension="Core" version="2.0">
-      <param name="type"><type>ActiveUniformType</type></param>
+    
+    <!-- Fine Control of Buffer Updates [4.2.2] -->
+    <function name="StencilMaskSeparate">
+      <param name="face"><type>StencilFace</type></param>
     </function>
-
-    <function name="GetError" extension="Core" version="2.0">
-      <returns>ErrorCode</returns>
+    
+    <!-- Clearing the Buffers [4.2.3] -->
+    <function name="Clear">
+      <param name="mask"><type>ClearBufferMask</type></param>
     </function>
-
-    <function name="GetProgram" extension="Core" version="2.0">
-      <param name="pname"><type>ProgramParameter</type></param>
+    <function name="ClearBuffer">
+      <param name="buffer"><type>ClearBuffer</type></param>
     </function>
-
-    <function name="GetShader" extension="Core" version="2.0">
-      <param name="pname"><type>ShaderParameter</type></param> 
+    <function name="ClearBufferfi">
+      <param name="buffer"><type>ClearBufferCombined</type></param>
     </function>
-
-    <function name="GetString" extension="Core" version="2.0">
-      <param name="name"><type>StringName</type></param> 
+    
+    <!-- Sync Objects and Fences [5.2] -->
+    <function name="FenceSync">
+      <param name="condition"><type>SyncCondition</type></param>
+      <param name="flags"><type>WaitSyncFlags</type></param>
     </function>
-
-    <function name="GetVertexAttrib" extension="Core" version="2.0">
-      <param name="pname"><type>VertexAttribParameter</type></param> 
+    <function name="ClientWaitSync">
+      <returns>WaitSyncStatus</returns>
+      <param name="flags"><type>ClientWaitSyncFlags</type></param>
     </function>
-     
-    <function name="GetVertexAttribPointer" extension="Core" version="2.0">
-      <param name="pname"><type>VertexAttribPointerParameter</type></param> 
+    <function name="WaitSync">
+      <param name="flags"><type>WaitSyncFlags</type></param>
     </function>
-      
-    <function name="ActiveTexture" extension="Core" version="2.0">
-      <param name="texture"><type>TextureUnit</type></param>
+    
+    <!-- Sync Object Queries [6.1.8] -->
+    <function name="GetSync">
+      <param name="pname"><type>SyncParameterName</type></param>
     </function>
- 
-    <function name="BindTexture" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
+    
+    <!-- Pixel Rectangles [3.7.1] -->
+    <function name="PixelStore">
+      <param name="pname"><type>PixelStoreParameter</type></param>
     </function>
-     
-    <function name="GenerateMipmap" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-    </function>
-     
-    <function name="GetTexParameter" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-      <param name="pname"><type>GetTextureParameter</type></param>
-    </function>
-     
-    <function name="TexParameter" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-      <param name="pname"><type>TextureParameterName</type></param>
-    </function>
-     
-    <function name="TexImage2D" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-      <param name="internalformat"><type>PixelInternalFormat</type></param>
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-     
-    <function name="TexSubImage2D" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-      <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>
-    </function>
-     
-    <function name="CopyTexSubImage2D" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-    </function>
-     
-    <function name="CompressedTexImage2D" extension="Core" version="2.0">
-      <param name="target"><type>TextureTarget</type></param>
-      <param name="internalformat"><type>PixelInternalFormat</type></param>
-    </function>
-     
-    <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">
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-     
-    <function name="CheckFramebufferStatus" extension="Core" version="2.0">
-      <returns>FramebufferErrorCode</returns>
+    
+    <!-- Binding & Managing Framebuffer Objects [4.4.1] -->
+    <function name="BindFramebuffer">
       <param name="target"><type>FramebufferTarget</type></param>
     </function>
-     
-    <function name="BindFramebuffer" extension="Core" version="2.0">
-      <param name="target"><type>FramebufferTarget</type></param>
-    </function>
-
-    <function name="BindRenderbuffer" extension="Core" version="2.0">
+    
+    <!-- Renderbuffer Objects [4.4.2] -->
+    <function name="BindRenderbuffer">
       <param name="target"><type>RenderbufferTarget</type></param>
     </function>
-      
-    <function name="RenderbufferStorage" extension="Core" version="2.0">
+    <function name="RenderbufferStorage">
       <param name="target"><type>RenderbufferTarget</type></param>
       <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
     </function>
-      
-    <function name="GetRenderbufferParameter" extension="Core" version="2.0">
+    <function name="RenderbufferStorageMultisample">
       <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="pname"><type>RenderbufferParameterName</type></param>
+      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
     </function>
-      
-    <function name="FramebufferRenderbuffer" extension="Core" version="2.0">
+    
+    <!-- Attaching Renderbuffer Images to Framebuffer -->
+    <function name="FramebufferRenderbuffer">
       <param name="target"><type>FramebufferTarget</type></param>
       <param name="attachment"><type>FramebufferSlot</type></param>
       <param name="renderbuffertarget"><type>RenderbufferTarget</type></param>
     </function>
-     
-    <function name="FramebufferTexture2D" extension="Core" version="2.0">
+    
+    <!-- Attaching Texture Images to a Framebuffer -->
+    <function name="FramebufferTexture2D">
       <param name="target"><type>FramebufferTarget</type></param>
       <param name="attachment"><type>FramebufferSlot</type></param>
-      <param name="textarget"><type>TextureTarget</type></param>
+      <param name="textarget"><type>TextureTarget2d</type></param>
+    </function>
+    <function name="FramebufferTextureLayer">
+      <param name="target"><type>FramebufferTarget</type></param>
+      <param name="attachment"><type>FramebufferSlot</type></param>
+      <param name="textarget"><type>TextureTarget3d</type></param>
     </function>
     
-    <function name="GetFramebufferAttachmentParameter" extension="Core" version="2.0">
+    <!-- Framebuffer Completeness [4.4.4] -->
+    <function name="CheckFramebufferStatus">
+      <returns>FramebufferErrorCode</returns>
       <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachment"><type>FramebufferSlot</type></param>
+    </function>
+    
+    <!-- Invalidating Framebuffer Contents [4.5] -->
+    <function name="InvalidateFramebuffer">
+      <param name="target"><type>FramebufferTarget</type></param>
+      <param name="attachments"><type>FramebufferAttachment</type></param>
+    </function>
+    <function name="InvalidateSubFramebuffer">
+      <param name="target"><type>FramebufferTarget</type></param>
+      <param name="attachments"><type>FramebufferAttachment</type></param>
+    </function>
+    
+    <!-- Renderbuffer Object Queries [6.1.13-14] -->
+    <function name="GetRenderbufferParameter">
+      <param name="target"><type>RenderbufferTarget</type></param>
+      <param name="pname"><type>RenderbufferParameterName</type></param>
+    </function>
+    
+    <!-- Simple Queries [6.1.1] -->
+    <function name="GetFramebufferAttachmentParameter">
+      <param name="target"><type>FramebufferTarget</type></param>
+      <param name="attachment"><type>FramebufferAttachment</type></param>
       <param name="pname"><type>FramebufferParameterName</type></param>
     </function>
+    <function name="GetInternalformat">
+      <param name="target"><type>RenderbufferTarget</type></param>
+      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
+      <param name="pname"><type>InternalFormatParameter</type></param>
+    </function>
 
-    <function name="PixelStore" extension="Core" version="2.0">
-      <param name="pname"><type>PixelStoreParameter</type></param>
+    <!-- String Queries [6.1.6] -->
+    <function name="GetBoolean">
+      <param name="pname"><type>GetPName</type></param>
+    </function>
+    <function name="GetFloat">
+      <param name="pname"><type>GetPName</type></param>
+    </function>
+    <function name="GetInteger">
+      <param name="pname"><type>GetPName</type></param>
+    </function>
+    <function name="GetIntegeri_v">
+      <param name="target"><type>GetIndexedPName</type></param>
+    </function>
+    <function name="GetInteger64">
+      <param name="pname"><type>GetPName</type></param>
+    </function>
+    <function name="GetInteger64i_v">
+      <param name="target"><type>GetIndexedPName</type></param>
+    </function>
+    <function name="GetString">
+      <param name="name"><type>StringName</type></param>
+    </function>
+    <function name="GetStringi">
+      <param name="name"><type>StringNameIndexed</type></param>
     </function>
     
-    <function name="GetBoolean" extension="Core">
-      <param name="pname"><type>GetPName</type></param>
+    <!-- KHR_debug -->
+    <function name="DebugMessageControl">
+      <param name="source"><type>DebugSourceControl</type></param>
+      <param name="type"><type>DebugTypeControl</type></param>
+      <param name="severity"><type>DebugSeverityControl</type></param>
     </function>
- 
-    <function name="GetFloat" extension="Core">
-      <param name="pname"><type>GetPName</type></param>
+    <function name="DebugMessageInsert">
+      <param name="source"><type>DebugSourceExternal</type></param>
+      <param name="type"><type>DebugType</type></param>
+      <param name="severity"><type>DebugSeverity</type></param>
     </function>
-     
-    <function name="GetInteger" extension="Core">
-      <param name="pname"><type>GetPName</type></param>
+    <function name="GetDebugMessageLog">
+      <param name="sources"><type>DebugSourceExternal</type></param>
+      <param name="types"><type>DebugType</type></param>
+      <param name="severities"><type>DebugSeverity</type></param>
     </function>
+    <function name="GetObjectLabel">
+      <param name="identifier"><type>ObjectLabelIdentifier</type></param>
+    </function>
+    <function name="ObjectLabel">
+      <param name="identifier"><type>ObjectLabelIdentifier</type></param>
+    </function>
+   </replace>
 
-    <function name="GetError" extension="Core">
-      <returns>ErrorCode</returns>
-    </function>
-
-    <function name="GetAttribLocation" extension="Core">
-      <param name="name"><flow>in</flow></param>
-    </function>
-    
-    <function name="GetUniformLocation" extension="Core">
-      <param name="name"><flow>in</flow></param>
-    </function>
-
-  </replace>
-  
+  <!--  gles2 overloads for 2.0 backwards compatibility-->
   <overload name="gles2" version="2.0">
     <!-- PrimtiveType <=> BeginMode overloads for backwards compatibility -->
     <function name="DrawArrays" category="ES_VERSION_2_0" extension="Core" version="2.0">
@@ -4399,6 +4587,7 @@
     </function>
   </overload>
 
+ <!-- gles2 2.0 enums -->
   <add name="gles2" version="2.0">
 
     <enum name="BlendEquationMode">
@@ -5012,468 +5201,7 @@
     
   </add>
   
-  <!-- gles2 3.0 -->
-  <replace name="gles2" version="2.0|3.0">
-    <!-- Buffer Objects [2.9] -->
-    <function name="BindBuffer">
-      <param name="target"><type>BufferTarget</type></param>
-    </function>
-    <function name="BindBufferRange">
-      <param name="target"><type>BufferRangeTarget</type></param>
-    </function>
-    <function name="BindBufferBase">
-      <param name="target"><type>BufferRangeTarget</type></param>
-    </function>
-    <function name="BufferData">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="usage"><type>BufferUsageHint</type></param>
-    </function>
-    <function name="BufferSubData">
-      <param name="target"><type>BufferTarget</type></param>
-    </function>
-    <function name="CopyBufferSubData">
-      <param name="readTarget"><type>BufferTarget</type></param>
-      <param name="writeTarget"><type>BufferTarget</type></param>
-    </function>
-    <function name="FlushMappedBufferRange">
-      <param name="target"><type>BufferTarget</type></param>
-    </function>
-    <function name="MapBufferRange">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="target"><type>BufferAccessMask</type></param>
-    </function> 
-    <function name="UnmapBuffer">
-      <param name="target"><type>BufferTarget</type></param>
-    </function>
-    
-    <!-- Buffer Object Queries [6.1.9] -->
-    <function name="GetBufferParameter">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="pname"><type>BufferParameterName</type></param>
-    </function>
-    <function name="GetBufferPointer">
-      <param name="target"><type>BufferTarget</type></param>
-      <param name="pname"><type>BufferPointer</type></param>
-    </function>
-    
-    <!-- Asynchronous Queries [2.13, 6.1.7] -->
-    <function name="BeginQuery">
-      <param name="target"><type>QueryTarget</type></param>
-    </function>
-    <function name="EndQuery">
-      <param name="target"><type>QueryTarget</type></param>
-    </function>
-    <function name="GetQuery">
-      <param name="target"><type>QueryTarget</type></param>
-      <param name="pname"><type>GetQueryParam</type></param>
-    </function>
-    <function name="GetQueryObject">
-      <param name="pname"><type>GetQueryObjectParam</type></param>
-    </function>
-    
-    <!-- Transform Feedback [2.14, 6.1.11] -->
-    <function name="BindTransformFeedback">
-      <param name="target"><type>TransformFeedbackTarget</type></param>
-    </function>
-    <function name="BeginTransformFeedback">
-      <param name="primitiveMode"><type>TransformFeedbackPrimitiveType</type></param>
-    </function>
-    
-    <!-- Reading and Copying Pixels [4.3.1-2] -->
-    <function name="ReadPixels">
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-    <function name="ReadBuffer">
-      <param name="src"><type>ReadBufferMode</type></param>
-    </function>
-    <function name="BlitFramebuffer">
-      <param name="mask"><type>ClearBufferMask</type></param>
-      <param name="filter"><type>BlitFramebufferFilter</type></param>
-    </function>
-    
-    <!-- Polygons [3.6] -->
-    <function name="FrontFace">
-      <param name="dir"><type>FrontFaceDirection</type></param>
-    </function>
-    <function name="CullFace">
-      <param name="face"><type>CullFaceMode</type></param>
-    </function>
-    
-    <!-- Vertex Arrays [2.8] -->
-    <function name="VertexAttribIPointer">
-      <param name="type"><type>VertexAttribIntegerType</type></param>
-    </function>
-    
-    <!-- Drawing [2.8.3] -->
-    <function name="DrawArrays">
-      <param name="mode"><type>PrimitiveType</type></param>
-    </function>
-    <function name="DrawArraysInstanced">
-      <param name="mode"><type>PrimitiveType</type></param>
-    </function>
-    <function name="DrawElements">
-      <param name="mode"><type>PrimitiveType</type></param>
-      <param name="type"><type>DrawElementsType</type></param>
-    </function>
-    <function name="DrawElementsInstanced">
-      <param name="mode"><type>PrimitiveType</type></param>
-      <param name="type"><type>DrawElementsType</type></param>
-    </function>
-    <function name="DrawRangeElements">
-      <param name="mode"><type>PrimitiveType</type></param>
-      <param name="type"><type>DrawElementsType</type></param>
-    </function>
-
-    <!-- Program Objects [2.11.3-4] -->
-    <function name="ProgramParameter">
-      <param name="pname"><type>ProgramParameterName</type></param>
-    </function>
-    
-    <!-- Uniform Variables [2.11.6] -->
-    <function name="GetActiveUniform">
-      <param name="type"><type>ActiveUniformType</type></param>
-    </function>
-    <function name="GetActiveUniforms">
-      <param name="pname"><type>ActiveUniformParameter</type></param>
-    </function>
-    <function name="GetActiveUniformBlock">
-      <param name="pname"><type>ActiveUniformBlockParameter</type></param>
-    </function>
-    
-    <!-- Output Variables [2.11.8] -->
-    <function name="GetTransformFeedbackVarying">
-      <param name="type"><type>TransformFeedbackType</type></param>
-    </function>
-    <function name="TransformFeedbackVaryings">
-      <param name="bufferMode"><type>TransformFeedbackMode</type></param>
-    </function>
-
-	<!-- Shader Queries [6.1.12] -->
-    <function name="GetShader">
-      <param name="pname"><type>ShaderParameter</type></param> 
-    </function>
-    <function name="GetShaderPrecisionFormat">
-      <param name="shadertype"><type>ShaderType</type></param>
-      <param name="precisiontype"><type>ShaderPrecision</type></param>
-    </function>
-    <function name="GetVertexAttrib">
-      <param name="pname"><type>VertexAttribParameter</type></param> 
-    </function>
-    <function name="GetVertexAttribPointer">
-      <param name="pname"><type>VertexAttribPointerParameter</type></param> 
-    </function>
-    
-    <!-- Program Queries [6.1.12] -->
-    <function name="GetProgram">
-      <param name="pname"><type>ProgramParameter</type></param>
-    </function>
-    
-    <!-- Texturing [3.8] -->
-    <function name="ActiveTexture">
-      <param name="texture"><type>TextureUnit</type></param>
-    </function>
-    <function name="BindTexture">
-      <param name="target"><type>TextureTarget</type></param>
-    </function>
-    
-    <!-- Sampler Objects [3.8.2] -->
-    <function name="SamplerParameter">
-      <param name="pname"><type>SamplerParameterName</type></param>
-    </function>
-
-    <!-- Sampler Queries [6.1.5] -->
-    <function name="GetSamplerParameter">
-      <param name="pname"><type>SamplerParameterName</type></param>
-    </function>
-
-    <!-- Texture Image Specification [3.8.3-4] -->
-    <function name="TexImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-      <param name="internalformat"><type>TextureComponentCount</type></param>
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-    <function name="TexImage3D">
-      <param name="target"><type>TextureTarget3d</type></param>
-      <param name="internalformat"><type>TextureComponentCount</type></param>
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-    <function name="TexStorage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-      <param name="internalformat"><type>SizedInternalFormat</type></param>
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-    <function name="TexStorage3D">
-      <param name="target"><type>TextureTarget2d</type></param>
-      <param name="internalformat"><type>SizedInternalFormat</type></param>
-      <param name="format"><type>PixelFormat</type></param>
-      <param name="type"><type>PixelType</type></param>
-    </function>
-    
-    <!-- Alt. Texture Image Specification Commands [3.8.5] -->
-    <function name="CopyTexImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-      <param name="internalformat"><type>TextureCopyComponentCount</type></param>
-    </function>
-    <function name="TexSubImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-    </function>
-    <function name="TexSubImage3D">
-      <param name="target"><type>TextureTarget3d</type></param>
-    </function>
-    <function name="CopyTexSubImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-    </function>
-    <function name="CopyTexSubImage3D">
-      <param name="target"><type>TextureTarget3d</type></param>
-    </function>
-    
-    <!-- Compressed Texture Images [3.8.6] -->
-    <function name="CompressedTexImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-      <param name="internalformat"><type>CompressedInternalFormat</type></param>
-    </function>
-    <function name="CompressedTexImage3D">
-      <param name="target"><type>TextureTarget3d</type></param>
-      <param name="internalformat"><type>CompressedInternalFormat</type></param>
-    </function>
-    <function name="CompressedTexSubImage2D">
-      <param name="target"><type>TextureTarget2d</type></param>
-    </function>
-    <function name="CompressedTexSubImage3D">
-      <param name="target"><type>TextureTarget3d</type></param>
-    </function>
-    
-    <!-- Texture Parameters [3.8.7] -->
-    <function name="TexParameter">
-      <param name="target"><type>TextureTarget</type></param>
-      <param name="pname"><type>TextureParameterName</type></param>
-    </function>   
-    
-     <!-- Manual Mipmap Generation [3.8.9] -->
-     <function name="GenerateMipmap">
-       <param name="target"><type>TextureTarget</type></param>
-     </function>
-      
-      <!-- Enumerated Queries [6.1.3] -->
-     <function name="GetTexParameter">
-       <param name="target"><type>TextureTarget</type></param>
-      <param name="pname"><type>GetTextureParameterName</type></param>
-     </function>
-     
-     <!-- Stencil Test [4.1.4] -->
-     <function name="StencilFunc">
-       <param name="func"><type>StencilFunction</type></param>
-     </function>
-     <function name="StencilFuncSeparate">
-       <param name="face"><type>StencilFace</type></param>
-       <param name="func"><type>StencilFunction</type></param>
-     </function>
-     <function name="StencilOp">
-      <param name="sfail"><type>StencilOp</type></param>
-      <param name="dpfail"><type>StencilOp</type></param>
-      <param name="dppass"><type>StencilOp</type></param>
-    </function>
-    <function name="StencilOpSeparate">
-      <param name="face"><type>StencilFace</type></param>
-      <param name="func"><type>StencilFunction</type></param>
-      <param name="sfail"><type>StencilOp</type></param>
-      <param name="dpfail"><type>StencilOp</type></param>
-      <param name="dppass"><type>StencilOp</type></param>
-    </function>
-    
-    <!-- Depth Buffer Test [4.1.5] -->
-    <function name="DepthFunc">
-      <param name="func"><type>DepthFunction</type></param>
-    </function>
-    
-    <!-- Blending [4.1.7] -->
-    <function name="BlendEquation">
-      <param name="mode"><type>BlendEquationMode</type></param>
-    </function>
-    <function name="BlendEquationSeparate">
-      <param name="modeRGB"><type>BlendEquationMode</type></param>
-      <param name="modeAlpha"><type>BlendEquationMode</type></param>
-    </function>
-    <function name="BlendFunc">
-      <param name="sfactor"><type>BlendingFactorSrc</type></param>
-      <param name="dfactor"><type>BlendingFactorDest</type></param>
-    </function>
-    <function name="BlendFuncSeparate">
-      <param name="sfactorRGB"><type>BlendingFactorSrc</type></param>
-      <param name="dfactorRGB"><type>BlendingFactorDest</type></param>
-      <param name="sfactorAlpha"><type>BlendingFactorSrc</type></param>
-      <param name="dfactorAlpha"><type>BlendingFactorDest</type></param>
-    </function>
-    
-    <!-- Selecting a Buffer for Writing [4.2.1] -->
-    <function name="DrawBuffers">
-      <param name="bufs"><type>DrawBufferMode</type></param>
-    </function>
-    
-    <!-- Fine Control of Buffer Updates [4.2.2] -->
-    <function name="StencilMaskSeparate">
-      <param name="face"><type>StencilFace</type></param>
-    </function>
-    
-    <!-- Clearing the Buffers [4.2.3] -->
-    <function name="Clear">
-      <param name="mask"><type>ClearBufferMask</type></param>
-    </function>
-    <function name="ClearBuffer">
-      <param name="buffer"><type>ClearBuffer</type></param>
-    </function>
-    <function name="ClearBufferfi">
-      <param name="buffer"><type>ClearBufferCombined</type></param>
-    </function>
-    
-    <!-- Sync Objects and Fences [5.2] -->
-    <function name="FenceSync">
-      <param name="condition"><type>SyncCondition</type></param>
-      <param name="flags"><type>WaitSyncFlags</type></param>
-    </function>
-    <function name="ClientWaitSync">
-      <returns>WaitSyncStatus</returns>
-      <param name="flags"><type>ClientWaitSyncFlags</type></param>
-    </function>
-    <function name="WaitSync">
-      <param name="flags"><type>WaitSyncFlags</type></param>
-    </function>
-    
-    <!-- Sync Object Queries [6.1.8] -->
-    <function name="GetSync">
-      <param name="pname"><type>SyncParameterName</type></param>
-    </function>
-    
-    <!-- Pixel Rectangles [3.7.1] -->
-    <function name="PixelStore">
-      <param name="pname"><type>PixelStoreParameter</type></param>
-    </function>
-    
-    <!-- Binding & Managing Framebuffer Objects [4.4.1] -->
-    <function name="BindFramebuffer">
-      <param name="target"><type>FramebufferTarget</type></param>
-    </function>
-    
-    <!-- Renderbuffer Objects [4.4.2] -->
-    <function name="BindRenderbuffer">
-      <param name="target"><type>RenderbufferTarget</type></param>
-    </function>
-    <function name="RenderbufferStorage">
-      <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
-    </function>
-    <function name="RenderbufferStorageMultisample">
-      <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
-    </function>
-    
-    <!-- Attaching Renderbuffer Images to Framebuffer -->
-    <function name="FramebufferRenderbuffer">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachment"><type>FramebufferSlot</type></param>
-      <param name="renderbuffertarget"><type>RenderbufferTarget</type></param>
-    </function>
-    
-    <!-- Attaching Texture Images to a Framebuffer -->
-    <function name="FramebufferTexture2D">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachment"><type>FramebufferSlot</type></param>
-      <param name="textarget"><type>TextureTarget2d</type></param>
-    </function>
-    <function name="FramebufferTextureLayer">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachment"><type>FramebufferSlot</type></param>
-      <param name="textarget"><type>TextureTarget3d</type></param>
-    </function>
-    
-    <!-- Framebuffer Completeness [4.4.4] -->
-    <function name="CheckFramebufferStatus">
-      <returns>FramebufferErrorCode</returns>
-      <param name="target"><type>FramebufferTarget</type></param>
-    </function>
-    
-    <!-- Invalidating Framebuffer Contents [4.5] -->
-    <function name="InvalidateFramebuffer">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachments"><type>FramebufferAttachment</type></param>
-    </function>
-    <function name="InvalidateSubFramebuffer">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachments"><type>FramebufferAttachment</type></param>
-    </function>
-    
-    <!-- Renderbuffer Object Queries [6.1.13-14] -->
-    <function name="GetRenderbufferParameter">
-      <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="pname"><type>RenderbufferParameterName</type></param>
-    </function>
-    
-    <!-- Simple Queries [6.1.1] -->
-    <function name="GetFramebufferAttachmentParameter">
-      <param name="target"><type>FramebufferTarget</type></param>
-      <param name="attachment"><type>FramebufferAttachment</type></param>
-      <param name="pname"><type>FramebufferParameterName</type></param>
-    </function>
-    <function name="GetInternalformat">
-      <param name="target"><type>RenderbufferTarget</type></param>
-      <param name="internalformat"><type>RenderbufferInternalFormat</type></param>
-      <param name="pname"><type>InternalFormatParameter</type></param>
-    </function>
-
-    <!-- String Queries [6.1.6] -->
-    <function name="GetBoolean">
-      <param name="pname"><type>GetPName</type></param>
-    </function>
-    <function name="GetFloat">
-      <param name="pname"><type>GetPName</type></param>
-    </function>
-    <function name="GetInteger">
-      <param name="pname"><type>GetPName</type></param>
-    </function>
-    <function name="GetIntegeri_v">
-      <param name="target"><type>GetIndexedPName</type></param>
-    </function>
-    <function name="GetInteger64">
-      <param name="pname"><type>GetPName</type></param>
-    </function>
-    <function name="GetInteger64i_v">
-      <param name="target"><type>GetIndexedPName</type></param>
-    </function>
-    <function name="GetString">
-      <param name="name"><type>StringName</type></param>
-    </function>
-    <function name="GetStringi">
-      <param name="name"><type>StringNameIndexed</type></param>
-    </function>
-    
-    <!-- KHR_debug -->
-    <function name="DebugMessageControl">
-      <param name="source"><type>DebugSourceControl</type></param>
-      <param name="type"><type>DebugTypeControl</type></param>
-      <param name="severity"><type>DebugSeverityControl</type></param>
-    </function>
-    <function name="DebugMessageInsert">
-      <param name="source"><type>DebugSourceExternal</type></param>
-      <param name="type"><type>DebugType</type></param>
-      <param name="severity"><type>DebugSeverity</type></param>
-    </function>
-    <function name="GetDebugMessageLog">
-      <param name="sources"><type>DebugSourceExternal</type></param>
-      <param name="types"><type>DebugType</type></param>
-      <param name="severities"><type>DebugSeverity</type></param>
-    </function>
-    <function name="GetObjectLabel">
-      <param name="identifier"><type>ObjectLabelIdentifier</type></param>
-    </function>
-    <function name="ObjectLabel">
-      <param name="identifier"><type>ObjectLabelIdentifier</type></param>
-    </function>
-   </replace>
-  
+  <!-- gles2 3.0 enums -->
   <add name="gles2" version="3.0">
     <enum name="ActiveAttribType">
       <use token="FLOAT" />
diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs
index 533c7b4f..f39f997d 100644
--- a/Source/OpenTK/Graphics/ES20/ES20.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20.cs
@@ -1267,52 +1267,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferANGLE")]
             public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, Int32 mask, OpenTK.Graphics.ES20.All filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-                    /// <summary>[requires: ANGLE_framebuffer_blit]
-                    /// Copy a block of pixels from the read framebuffer to the draw framebuffer
-                    /// </summary>
-                    /// <param name="srcX0">
-                    /// <para>
-                    /// Specify the bounds of the source rectangle within the read buffer of the read framebuffer.
-                    /// </para>
-                    /// </param>
-                    /// <param name="dstX0">
-                    /// <para>
-                    /// Specify the bounds of the destination rectangle within the write buffer of the write framebuffer.
-                    /// </para>
-                    /// </param>
-                    /// <param name="mask">
-                    /// <para>
-                    /// The bitwise OR of the flags indicating which buffers are to be copied. The allowed flags are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT and GL_STENCIL_BUFFER_BIT.
-                    /// </para>
-                    /// </param>
-                    /// <param name="filter">
-                    /// <para>
-                    /// Specifies the interpolation to be applied if the image is stretched. Must be GL_NEAREST or GL_LINEAR.
-                    /// </para>
-                    /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ANGLE_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferANGLE")]
-            public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
+                Delegates.glBlitFramebufferANGLE((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
                 #if DEBUG
                 }
                 #endif
@@ -1387,13 +1348,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_instanced_arrays", Version = "", EntryPoint = "glDrawElementsInstancedANGLE")]
             public static 
-            void DrawElementsInstanced(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount)
+            void DrawElementsInstanced(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices, (Int32)primcount);
+                Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
                 #if DEBUG
                 }
                 #endif
@@ -1430,7 +1391,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_instanced_arrays", Version = "", EntryPoint = "glDrawElementsInstancedANGLE")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -1440,7 +1401,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -1482,7 +1443,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_instanced_arrays", Version = "", EntryPoint = "glDrawElementsInstancedANGLE")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -1492,7 +1453,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -1534,7 +1495,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_instanced_arrays", Version = "", EntryPoint = "glDrawElementsInstancedANGLE")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -1544,7 +1505,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -1586,7 +1547,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_instanced_arrays", Version = "", EntryPoint = "glDrawElementsInstancedANGLE")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -1596,7 +1557,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedANGLE((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                     indices = (T3)indices_ptr.Target;
                 }
                 finally
@@ -1759,13 +1720,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "ANGLE_framebuffer_multisample", Version = "", EntryPoint = "glRenderbufferStorageMultisampleANGLE")]
             public static 
-            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glRenderbufferStorageMultisampleANGLE((OpenTK.Graphics.ES20.All)target, (Int32)samples, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glRenderbufferStorageMultisampleANGLE((OpenTK.Graphics.ES20.RenderbufferTarget)target, (Int32)samples, (OpenTK.Graphics.ES20.RenderbufferInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -1853,13 +1814,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glClientWaitSyncAPPLE")]
             public static 
-            OpenTK.Graphics.ES20.All ClientWaitSync(IntPtr sync, Int32 flags, Int64 timeout)
+            WaitSyncStatus ClientWaitSync(IntPtr sync, ClientWaitSyncFlags flags, Int64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (ClientWaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -1887,13 +1848,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glClientWaitSyncAPPLE")]
             public static 
-            OpenTK.Graphics.ES20.All ClientWaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
+            WaitSyncStatus ClientWaitSync(IntPtr sync, ClientWaitSyncFlags flags, UInt64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                return Delegates.glClientWaitSyncAPPLE((IntPtr)sync, (ClientWaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -1969,42 +1930,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glFenceSyncAPPLE")]
             public static 
-            IntPtr FenceSync(OpenTK.Graphics.ES20.All condition, Int32 flags)
+            IntPtr FenceSync(SyncCondition condition, WaitSyncFlags flags)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glFenceSyncAPPLE((OpenTK.Graphics.ES20.All)condition, (UInt32)flags);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-                    /// <summary>[requires: APPLE_sync]
-                    /// Create a new sync object and insert it into the GL command stream
-                    /// </summary>
-                    /// <param name="condition">
-                    /// <para>
-                    /// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
-                    /// </para>
-                    /// </param>
-                    /// <param name="flags">
-                    /// <para>
-                    /// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
-                    /// </para>
-                    /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glFenceSyncAPPLE")]
-            public static 
-            IntPtr FenceSync(OpenTK.Graphics.ES20.All condition, UInt32 flags)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glFenceSyncAPPLE((OpenTK.Graphics.ES20.All)condition, (UInt32)flags);
+                return Delegates.glFenceSyncAPPLE((SyncCondition)condition, (WaitSyncFlags)flags);
                 #if DEBUG
                 }
                 #endif
@@ -2013,7 +1945,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: APPLE_sync]</summary>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetInteger64vAPPLE")]
             public static 
-            void GetInteger64(OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64[] @params)
+            void GetInteger64(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2023,7 +1955,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.GetPName)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -2034,7 +1966,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: APPLE_sync]</summary>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetInteger64vAPPLE")]
             public static 
-            void GetInteger64(OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int64 @params)
+            void GetInteger64(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2044,7 +1976,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.GetPName)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -2057,13 +1989,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetInteger64vAPPLE")]
             public static 
-            unsafe void GetInteger64(OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params)
+            unsafe void GetInteger64(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.All)pname, (Int64*)@params);
+                Delegates.glGetInteger64vAPPLE((OpenTK.Graphics.ES20.GetPName)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -2100,7 +2032,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            void GetSync(IntPtr sync, OpenTK.Graphics.ES20.All pname, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] values)
+            void GetSync(IntPtr sync, SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] Int32[] values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2111,7 +2043,7 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = length)
                     fixed (Int32* values_ptr = values)
                     {
-                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES20.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                     }
                 }
                 #if DEBUG
@@ -2150,7 +2082,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            void GetSync(IntPtr sync, OpenTK.Graphics.ES20.All pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+            void GetSync(IntPtr sync, SyncParameterName pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2161,7 +2093,7 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = &length)
                     fixed (Int32* values_ptr = &values)
                     {
-                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES20.All)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                        Delegates.glGetSyncivAPPLE((IntPtr)sync, (SyncParameterName)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
                         length = *length_ptr;
                         values = *values_ptr;
                     }
@@ -2203,13 +2135,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glGetSyncivAPPLE")]
             public static 
-            unsafe void GetSync(IntPtr sync, OpenTK.Graphics.ES20.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+            unsafe void GetSync(IntPtr sync, SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetSyncivAPPLE((IntPtr)sync, (OpenTK.Graphics.ES20.All)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+                Delegates.glGetSyncivAPPLE((IntPtr)sync, (SyncParameterName)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
                 #if DEBUG
                 }
                 #endif
@@ -2269,13 +2201,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_framebuffer_multisample", Version = "", EntryPoint = "glRenderbufferStorageMultisampleAPPLE")]
             public static 
-            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glRenderbufferStorageMultisampleAPPLE((OpenTK.Graphics.ES20.All)target, (Int32)samples, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glRenderbufferStorageMultisampleAPPLE((OpenTK.Graphics.ES20.RenderbufferTarget)target, (Int32)samples, (OpenTK.Graphics.ES20.RenderbufferInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -2317,13 +2249,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glWaitSyncAPPLE")]
             public static 
-            void WaitSync(IntPtr sync, Int32 flags, Int64 timeout)
+            void WaitSync(IntPtr sync, WaitSyncFlags flags, Int64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                Delegates.glWaitSyncAPPLE((IntPtr)sync, (WaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -2351,13 +2283,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glWaitSyncAPPLE")]
             public static 
-            void WaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
+            void WaitSync(IntPtr sync, WaitSyncFlags flags, UInt64 timeout)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWaitSyncAPPLE((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
+                Delegates.glWaitSyncAPPLE((IntPtr)sync, (WaitSyncFlags)flags, (UInt64)timeout);
                 #if DEBUG
                 }
                 #endif
@@ -2888,13 +2820,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBlendFuncSeparate")]
         public static 
-        void BlendFuncSeparate(OpenTK.Graphics.ES20.All sfactorRGB, OpenTK.Graphics.ES20.All dfactorRGB, OpenTK.Graphics.ES20.All sfactorAlpha, OpenTK.Graphics.ES20.All dfactorAlpha)
+        void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES20.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES20.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dfactorAlpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.All)sfactorRGB, (OpenTK.Graphics.ES20.All)dfactorRGB, (OpenTK.Graphics.ES20.All)sfactorAlpha, (OpenTK.Graphics.ES20.All)dfactorAlpha);
+            Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.BlendingFactorSrc)sfactorRGB, (OpenTK.Graphics.ES20.BlendingFactorDest)dfactorRGB, (OpenTK.Graphics.ES20.BlendingFactorSrc)sfactorAlpha, (OpenTK.Graphics.ES20.BlendingFactorDest)dfactorAlpha);
             #if DEBUG
             }
             #endif
@@ -2926,13 +2858,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, BufferUsageHint usage)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.ES20.BufferUsage)usage);
+            Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data, (BufferUsageHint)usage);
             #if DEBUG
             }
             #endif
@@ -2964,7 +2896,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -2974,7 +2906,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (BufferUsageHint)usage);
             }
             finally
             {
@@ -3011,7 +2943,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,] data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,] data, BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3021,7 +2953,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (BufferUsageHint)usage);
             }
             finally
             {
@@ -3058,7 +2990,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3068,7 +3000,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (BufferUsageHint)usage);
             }
             finally
             {
@@ -3105,7 +3037,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -3115,7 +3047,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
+                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (BufferUsageHint)usage);
                 data = (T2)data_ptr.Target;
             }
             finally
@@ -3590,13 +3522,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
+        void CompressedTexImage2D(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
+            Delegates.glCompressedTexImage2D((TextureTarget2d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
             #if DEBUG
             }
             #endif
@@ -3648,7 +3580,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
+        void CompressedTexImage2D<T7>(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
             where T7 : struct
         {
             #if DEBUG
@@ -3658,7 +3590,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexImage2D((TextureTarget2d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -3715,7 +3647,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,] data)
+        void CompressedTexImage2D<T7>(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,] data)
             where T7 : struct
         {
             #if DEBUG
@@ -3725,7 +3657,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexImage2D((TextureTarget2d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -3782,7 +3714,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
+        void CompressedTexImage2D<T7>(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
             where T7 : struct
         {
             #if DEBUG
@@ -3792,7 +3724,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexImage2D((TextureTarget2d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -3849,7 +3781,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
+        void CompressedTexImage2D<T7>(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
             where T7 : struct
         {
             #if DEBUG
@@ -3859,7 +3791,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexImage2D((TextureTarget2d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 data = (T7)data_ptr.Target;
             }
             finally
@@ -3922,13 +3854,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_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.PixelFormat format, Int32 imageSize, IntPtr data)
+        void CompressedTexSubImage2D(TextureTarget2d 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.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            Delegates.glCompressedTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
             #if DEBUG
             }
             #endif
@@ -3985,7 +3917,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_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.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+        void CompressedTexSubImage2D<T8>(TextureTarget2d 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
@@ -3995,7 +3927,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.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4057,7 +3989,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_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.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data)
+        void CompressedTexSubImage2D<T8>(TextureTarget2d 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
@@ -4067,7 +3999,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.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4129,7 +4061,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_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.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+        void CompressedTexSubImage2D<T8>(TextureTarget2d 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
@@ -4139,7 +4071,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.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -4201,7 +4133,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_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.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+        void CompressedTexSubImage2D<T8>(TextureTarget2d 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
@@ -4211,7 +4143,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.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                Delegates.glCompressedTexSubImage2D((TextureTarget2d)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
@@ -4264,13 +4196,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCopyTexImage2D")]
         public static 
-        void CopyTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border)
+        void CopyTexImage2D(TextureTarget2d target, Int32 level, TextureCopyComponentCount internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCopyTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)x, (Int32)y, (Int32)width, (Int32)height, (Int32)border);
+            Delegates.glCopyTexImage2D((TextureTarget2d)target, (Int32)level, (TextureCopyComponentCount)internalformat, (Int32)x, (Int32)y, (Int32)width, (Int32)height, (Int32)border);
             #if DEBUG
             }
             #endif
@@ -4317,13 +4249,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glCopyTexSubImage2D")]
         public static 
-        void CopyTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height)
+        void CopyTexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCopyTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
+            Delegates.glCopyTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
             #if DEBUG
             }
             #endif
@@ -4606,7 +4538,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, Int32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, Int32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4616,7 +4548,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -4660,7 +4592,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, ref Int32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, ref Int32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4670,7 +4602,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -4715,13 +4647,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, Int32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, Int32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -4764,7 +4696,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4774,7 +4706,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (UInt32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -4819,7 +4751,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, ref UInt32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, ref UInt32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4829,7 +4761,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (UInt32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -4874,13 +4806,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -4922,13 +4854,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, Int32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, Int32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (UInt32)id, (OpenTK.Graphics.ES20.All)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES20.DebugSourceExternal)source, (OpenTK.Graphics.ES20.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES20.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -4971,13 +4903,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (UInt32)id, (OpenTK.Graphics.ES20.All)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.ES20.DebugSourceExternal)source, (OpenTK.Graphics.ES20.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES20.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -6749,13 +6681,13 @@ namespace OpenTK.Graphics.ES20
         /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glFramebufferTexture2D")]
         public static 
-        void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.TextureTarget textarget, Int32 texture, Int32 level)
+        void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, TextureTarget2d textarget, Int32 texture, Int32 level)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glFramebufferTexture2D((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.TextureTarget)textarget, (UInt32)texture, (Int32)level);
+            Delegates.glFramebufferTexture2D((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (TextureTarget2d)textarget, (UInt32)texture, (Int32)level);
             #if DEBUG
             }
             #endif
@@ -6765,13 +6697,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glFramebufferTexture2D")]
         public static 
-        void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.TextureTarget textarget, UInt32 texture, Int32 level)
+        void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, TextureTarget2d textarget, UInt32 texture, Int32 level)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glFramebufferTexture2D((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.TextureTarget)textarget, (UInt32)texture, (Int32)level);
+            Delegates.glFramebufferTexture2D((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (TextureTarget2d)textarget, (UInt32)texture, (Int32)level);
             #if DEBUG
             }
             #endif
@@ -8630,7 +8562,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All[] sources, [OutAttribute] OpenTK.Graphics.ES20.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES20.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8638,13 +8570,13 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.ES20.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.ES20.All* types_ptr = types)
+                fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = sources)
+                fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = types)
                 fixed (Int32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.ES20.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -8698,7 +8630,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.All sources, [OutAttribute] out OpenTK.Graphics.ES20.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES20.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES20.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES20.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8706,13 +8638,13 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.ES20.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.ES20.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = &types)
                 fixed (Int32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.ES20.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -8773,13 +8705,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources, (OpenTK.Graphics.ES20.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources, (OpenTK.Graphics.ES20.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
@@ -8832,7 +8764,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All[] sources, [OutAttribute] OpenTK.Graphics.ES20.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES20.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8840,13 +8772,13 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.ES20.All* sources_ptr = sources)
-                fixed (OpenTK.Graphics.ES20.All* types_ptr = types)
+                fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = sources)
+                fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = types)
                 fixed (UInt32* ids_ptr = ids)
-                fixed (OpenTK.Graphics.ES20.All* severities_ptr = severities)
+                fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = severities)
                 fixed (Int32* lengths_ptr = lengths)
                 {
-                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                 }
             }
             #if DEBUG
@@ -8901,7 +8833,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.All sources, [OutAttribute] out OpenTK.Graphics.ES20.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES20.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+        Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES20.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES20.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8909,13 +8841,13 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.ES20.All* sources_ptr = &sources)
-                fixed (OpenTK.Graphics.ES20.All* types_ptr = &types)
+                fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = &sources)
+                fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = &types)
                 fixed (UInt32* ids_ptr = &ids)
-                fixed (OpenTK.Graphics.ES20.All* severities_ptr = &severities)
+                fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = &severities)
                 fixed (Int32* lengths_ptr = &lengths)
                 {
-                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                    Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     sources = *sources_ptr;
                     types = *types_ptr;
                     ids = *ids_ptr;
@@ -8976,13 +8908,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")]
         public static 
-        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+        unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources, (OpenTK.Graphics.ES20.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+            return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources, (OpenTK.Graphics.ES20.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
             #if DEBUG
             }
             #endif
@@ -9084,7 +9016,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32[] @params)
+        void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9094,7 +9026,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params_ptr);
+                    Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.All)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -9128,7 +9060,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] out Int32 @params)
+        void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9138,7 +9070,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params_ptr);
+                    Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.All)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -9174,13 +9106,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params)
+        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params);
+            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.All)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -9276,7 +9208,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9286,7 +9218,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                 }
             }
             #if DEBUG
@@ -9325,7 +9257,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9335,7 +9267,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     length = *length_ptr;
                 }
             }
@@ -9376,13 +9308,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        unsafe void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+        unsafe void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+            Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
             #if DEBUG
             }
             #endif
@@ -9420,7 +9352,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9430,7 +9362,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                 }
             }
             #if DEBUG
@@ -9470,7 +9402,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9480,7 +9412,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     length = *length_ptr;
                 }
             }
@@ -9521,13 +9453,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabel")]
         public static 
-        unsafe void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+        unsafe void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+            Delegates.glGetObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
             #if DEBUG
             }
             #endif
@@ -11717,7 +11649,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
         public static 
-        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single[] @params)
+        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11727,7 +11659,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -11756,7 +11688,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
         public static 
-        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] out Single @params)
+        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11766,7 +11698,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Single* @params_ptr = &@params)
                 {
-                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Single*)@params_ptr);
+                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Single*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -11797,13 +11729,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
         public static 
-        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Single*)@params);
+            Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -11830,7 +11762,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
         public static 
-        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32[] @params)
+        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11840,7 +11772,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -11869,7 +11801,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
         public static 
-        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] out Int32 @params)
+        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11879,7 +11811,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Int32*)@params_ptr);
+                    Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -11910,13 +11842,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
         public static 
-        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Int32*)@params);
+            Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (GetTextureParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -13734,13 +13666,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glObjectLabel")]
         public static 
-        void ObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 length, String label)
+        void ObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 length, String label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)length, (String)label);
+            Delegates.glObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
             #if DEBUG
             }
             #endif
@@ -13773,13 +13705,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glObjectLabel")]
         public static 
-        void ObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label)
+        void ObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glObjectLabel((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)length, (String)label);
+            Delegates.glObjectLabel((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
             #if DEBUG
             }
             #endif
@@ -16895,13 +16827,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        void TexImage2D(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            Delegates.glTexImage2D((TextureTarget2d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -16958,7 +16890,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexImage2D<T8>(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -16968,7 +16900,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage2D((TextureTarget2d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17030,7 +16962,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,] pixels)
+        void TexImage2D<T8>(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17040,7 +16972,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage2D((TextureTarget2d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17102,7 +17034,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexImage2D<T8>(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17112,7 +17044,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage2D((TextureTarget2d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17174,7 +17106,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+        void TexImage2D<T8>(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17184,7 +17116,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexImage2D((TextureTarget2d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 pixels = (T8)pixels_ptr.Target;
             }
             finally
@@ -17507,13 +17439,13 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        void TexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            Delegates.glTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -17570,7 +17502,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexSubImage2D<T8>(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17580,7 +17512,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17642,7 +17574,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,] pixels)
+        void TexSubImage2D<T8>(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17652,7 +17584,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17714,7 +17646,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexSubImage2D<T8>(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17724,7 +17656,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
             }
             finally
             {
@@ -17786,7 +17718,7 @@ namespace OpenTK.Graphics.ES20
                 /// </param>
         [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+        void TexSubImage2D<T8>(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -17796,7 +17728,7 @@ namespace OpenTK.Graphics.ES20
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                Delegates.glTexSubImage2D((TextureTarget2d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 pixels = (T8)pixels_ptr.Target;
             }
             finally
@@ -21727,13 +21659,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glBeginQueryEXT")]
             public static 
-            void BeginQuery(OpenTK.Graphics.ES20.All target, Int32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.QueryTarget target, Int32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.All)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -21756,13 +21688,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glBeginQueryEXT")]
             public static 
-            void BeginQuery(OpenTK.Graphics.ES20.All target, UInt32 id)
+            void BeginQuery(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.All)target, (UInt32)id);
+                Delegates.glBeginQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target, (UInt32)id);
                 #if DEBUG
                 }
                 #endif
@@ -21831,13 +21763,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
             public static 
-            void BlendEquation(OpenTK.Graphics.ES20.All mode)
+            void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlendEquationEXT((OpenTK.Graphics.ES20.All)mode);
+                Delegates.glBlendEquationEXT((OpenTK.Graphics.ES20.BlendEquationMode)mode);
                 #if DEBUG
                 }
                 #endif
@@ -22413,7 +22345,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_draw_buffers", Version = "", EntryPoint = "glDrawBuffersEXT")]
             public static 
-            void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.All[] bufs)
+            void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode[] bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -22421,9 +22353,9 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* bufs_ptr = bufs)
+                    fixed (OpenTK.Graphics.ES20.DrawBufferMode* bufs_ptr = bufs)
                     {
-                        Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.All*)bufs_ptr);
+                        Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs_ptr);
                     }
                 }
                 #if DEBUG
@@ -22447,7 +22379,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_draw_buffers", Version = "", EntryPoint = "glDrawBuffersEXT")]
             public static 
-            void DrawBuffers(Int32 n, ref OpenTK.Graphics.ES20.All bufs)
+            void DrawBuffers(Int32 n, ref OpenTK.Graphics.ES20.DrawBufferMode bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -22455,9 +22387,9 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* bufs_ptr = &bufs)
+                    fixed (OpenTK.Graphics.ES20.DrawBufferMode* bufs_ptr = &bufs)
                     {
-                        Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.All*)bufs_ptr);
+                        Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs_ptr);
                     }
                 }
                 #if DEBUG
@@ -22482,13 +22414,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_draw_buffers", Version = "", EntryPoint = "glDrawBuffersEXT")]
             public static 
-            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.All* bufs)
+            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.All*)bufs);
+                Delegates.glDrawBuffersEXT((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs);
                 #if DEBUG
                 }
                 #endif
@@ -22809,13 +22741,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glEndQueryEXT")]
             public static 
-            void EndQuery(OpenTK.Graphics.ES20.All target)
+            void EndQuery(OpenTK.Graphics.ES20.QueryTarget target)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glEndQueryEXT((OpenTK.Graphics.ES20.All)target);
+                Delegates.glEndQueryEXT((OpenTK.Graphics.ES20.QueryTarget)target);
                 #if DEBUG
                 }
                 #endif
@@ -22842,13 +22774,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glFlushMappedBufferRangeEXT")]
             public static 
-            void FlushMappedBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length)
+            void FlushMappedBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glFlushMappedBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length);
+                Delegates.glFlushMappedBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length);
                 #if DEBUG
                 }
                 #endif
@@ -23299,7 +23231,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_multiview_draw_buffers]</summary>
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            void GetInteger(OpenTK.Graphics.ES20.All target, Int32 index, [OutAttribute] Int32[] data)
+            void GetInteger(GetIndexedPName target, Int32 index, [OutAttribute] Int32[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23309,7 +23241,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* data_ptr = data)
                     {
-                        Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data_ptr);
+                        Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr);
                     }
                 }
                 #if DEBUG
@@ -23320,7 +23252,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_multiview_draw_buffers]</summary>
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            void GetInteger(OpenTK.Graphics.ES20.All target, Int32 index, [OutAttribute] out Int32 data)
+            void GetInteger(GetIndexedPName target, Int32 index, [OutAttribute] out Int32 data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23330,7 +23262,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* data_ptr = &data)
                     {
-                        Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data_ptr);
+                        Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr);
                         data = *data_ptr;
                     }
                 }
@@ -23343,13 +23275,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            unsafe void GetInteger(OpenTK.Graphics.ES20.All target, Int32 index, [OutAttribute] Int32* data)
+            unsafe void GetInteger(GetIndexedPName target, Int32 index, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data);
+                Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -23359,7 +23291,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            void GetInteger(OpenTK.Graphics.ES20.All target, UInt32 index, [OutAttribute] Int32[] data)
+            void GetInteger(GetIndexedPName target, UInt32 index, [OutAttribute] Int32[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23369,7 +23301,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* data_ptr = data)
                     {
-                        Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data_ptr);
+                        Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr);
                     }
                 }
                 #if DEBUG
@@ -23381,7 +23313,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            void GetInteger(OpenTK.Graphics.ES20.All target, UInt32 index, [OutAttribute] out Int32 data)
+            void GetInteger(GetIndexedPName target, UInt32 index, [OutAttribute] out Int32 data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23391,7 +23323,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* data_ptr = &data)
                     {
-                        Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data_ptr);
+                        Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr);
                         data = *data_ptr;
                     }
                 }
@@ -23404,13 +23336,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_multiview_draw_buffers", Version = "", EntryPoint = "glGetIntegeri_vEXT")]
             public static 
-            unsafe void GetInteger(OpenTK.Graphics.ES20.All target, UInt32 index, [OutAttribute] Int32* data)
+            unsafe void GetInteger(GetIndexedPName target, UInt32 index, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetIntegeri_vEXT((OpenTK.Graphics.ES20.All)target, (UInt32)index, (Int32*)data);
+                Delegates.glGetIntegeri_vEXT((GetIndexedPName)target, (UInt32)index, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -24433,7 +24365,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
+            void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24443,7 +24375,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24454,7 +24386,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: EXT_disjoint_timer_query|EXT_occlusion_query_boolean]</summary>
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
+            void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24464,7 +24396,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24477,13 +24409,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryivEXT")]
             public static 
-            unsafe void GetQuery(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
+            unsafe void GetQuery(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
+                Delegates.glGetQueryivEXT((OpenTK.Graphics.ES20.QueryTarget)target, (OpenTK.Graphics.ES20.GetQueryParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24510,7 +24442,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24520,7 +24452,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24549,7 +24481,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24559,7 +24491,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24590,13 +24522,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24624,7 +24556,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24634,7 +24566,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24664,7 +24596,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24674,7 +24606,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params_ptr);
+                        Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24705,13 +24637,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24738,7 +24670,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24748,7 +24680,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24777,7 +24709,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24787,7 +24719,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24818,13 +24750,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24852,7 +24784,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24862,7 +24794,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -24892,7 +24824,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out Int32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24902,7 +24834,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params_ptr);
+                        Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -24933,13 +24865,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectivEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (Int32*)@params);
+                Delegates.glGetQueryObjectivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -24967,7 +24899,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24977,7 +24909,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -25007,7 +24939,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out UInt64 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -25017,7 +24949,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt64* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -25048,13 +24980,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query", Version = "", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt64*)@params);
+                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -25082,7 +25014,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32[] @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -25092,7 +25024,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = @params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -25122,7 +25054,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] out UInt32 @params)
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] out UInt32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -25132,7 +25064,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* @params_ptr = &@params)
                     {
-                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params_ptr);
+                        Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
                         @params = *@params_ptr;
                     }
                 }
@@ -25163,13 +25095,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_disjoint_timer_query|EXT_occlusion_query_boolean", Version = "", EntryPoint = "glGetQueryObjectuivEXT")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32* @params)
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.All)pname, (UInt32*)@params);
+                Delegates.glGetQueryObjectuivEXT((UInt32)id, (OpenTK.Graphics.ES20.GetQueryObjectParam)pname, (UInt32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -25341,13 +25273,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glMapBufferRangeEXT")]
             public static 
-            IntPtr MapBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, Int32 access)
+            IntPtr MapBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, Int32 access)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
+                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
                 #if DEBUG
                 }
                 #endif
@@ -25380,13 +25312,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_map_buffer_range", Version = "", EntryPoint = "glMapBufferRangeEXT")]
             public static 
-            IntPtr MapBufferRange(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access)
+            IntPtr MapBufferRange(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.All)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
+                return Delegates.glMapBufferRangeEXT((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)length, (UInt32)access);
                 #if DEBUG
                 }
                 #endif
@@ -26378,13 +26310,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
+            void ProgramParameter(Int32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -26412,13 +26344,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "EXT_separate_shader_objects", Version = "", EntryPoint = "glProgramParameteriEXT")]
             public static 
-            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value)
+            void ProgramParameter(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.All)pname, (Int32)value);
+                Delegates.glProgramParameteriEXT((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameterName)pname, (Int32)value);
                 #if DEBUG
                 }
                 #endif
@@ -31977,13 +31909,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_multisampled_render_to_texture", Version = "", EntryPoint = "glRenderbufferStorageMultisampleEXT")]
             public static 
-            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glRenderbufferStorageMultisampleEXT((OpenTK.Graphics.ES20.All)target, (Int32)samples, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glRenderbufferStorageMultisampleEXT((OpenTK.Graphics.ES20.RenderbufferTarget)target, (Int32)samples, (OpenTK.Graphics.ES20.RenderbufferInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -32058,13 +31990,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_texture_storage", Version = "", EntryPoint = "glTexStorage2DEXT")]
             public static 
-            void TexStorage2D(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void TexStorage2D(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexStorage2DEXT((OpenTK.Graphics.ES20.All)target, (Int32)levels, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glTexStorage2DEXT((TextureTarget2d)target, (Int32)levels, (SizedInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -32106,13 +32038,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "EXT_texture_storage", Version = "", EntryPoint = "glTexStorage3DEXT")]
             public static 
-            void TexStorage3D(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth)
+            void TexStorage3D(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexStorage3DEXT((OpenTK.Graphics.ES20.All)target, (Int32)levels, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth);
+                Delegates.glTexStorage3DEXT((TextureTarget2d)target, (Int32)levels, (SizedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth);
                 #if DEBUG
                 }
                 #endif
@@ -32479,13 +32411,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "IMG_multisampled_render_to_texture", Version = "", EntryPoint = "glRenderbufferStorageMultisampleIMG")]
             public static 
-            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glRenderbufferStorageMultisampleIMG((OpenTK.Graphics.ES20.All)target, (Int32)samples, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glRenderbufferStorageMultisampleIMG((OpenTK.Graphics.ES20.RenderbufferTarget)target, (Int32)samples, (OpenTK.Graphics.ES20.RenderbufferInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -32708,7 +32640,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, Int32[] ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, Int32[] ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32718,7 +32650,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* ids_ptr = ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -32762,7 +32694,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, ref Int32 ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, ref Int32 ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32772,7 +32704,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* ids_ptr = &ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -32817,13 +32749,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            unsafe void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, Int32* ids, bool enabled)
+            unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, Int32* ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
                 #if DEBUG
                 }
                 #endif
@@ -32866,7 +32798,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32[] ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32[] ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32876,7 +32808,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* ids_ptr = ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -32921,7 +32853,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, ref UInt32 ids, bool enabled)
+            void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, ref UInt32 ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32931,7 +32863,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (UInt32* ids_ptr = &ids)
                     {
-                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                        Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                     }
                 }
                 #if DEBUG
@@ -32976,13 +32908,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControlKHR")]
             public static 
-            unsafe void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled)
+            unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (OpenTK.Graphics.ES20.All)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+                Delegates.glDebugMessageControlKHR((OpenTK.Graphics.ES20.DebugSourceControl)source, (OpenTK.Graphics.ES20.DebugTypeControl)type, (OpenTK.Graphics.ES20.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
                 #if DEBUG
                 }
                 #endif
@@ -33024,13 +32956,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsertKHR")]
             public static 
-            void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, Int32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf)
+            void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, Int32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (UInt32)id, (OpenTK.Graphics.ES20.All)severity, (Int32)length, (String)buf);
+                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES20.DebugSourceExternal)source, (OpenTK.Graphics.ES20.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES20.DebugSeverity)severity, (Int32)length, (String)buf);
                 #if DEBUG
                 }
                 #endif
@@ -33073,13 +33005,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsertKHR")]
             public static 
-            void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf)
+            void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES20.All)source, (OpenTK.Graphics.ES20.All)type, (UInt32)id, (OpenTK.Graphics.ES20.All)severity, (Int32)length, (String)buf);
+                Delegates.glDebugMessageInsertKHR((OpenTK.Graphics.ES20.DebugSourceExternal)source, (OpenTK.Graphics.ES20.DebugType)type, (UInt32)id, (OpenTK.Graphics.ES20.DebugSeverity)severity, (Int32)length, (String)buf);
                 #if DEBUG
                 }
                 #endif
@@ -33131,7 +33063,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All[] sources, [OutAttribute] OpenTK.Graphics.ES20.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES20.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+            Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33139,13 +33071,13 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* sources_ptr = sources)
-                    fixed (OpenTK.Graphics.ES20.All* types_ptr = types)
+                    fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = sources)
+                    fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = types)
                     fixed (Int32* ids_ptr = ids)
-                    fixed (OpenTK.Graphics.ES20.All* severities_ptr = severities)
+                    fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = severities)
                     fixed (Int32* lengths_ptr = lengths)
                     {
-                        return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                        return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     }
                 }
                 #if DEBUG
@@ -33199,7 +33131,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.All sources, [OutAttribute] out OpenTK.Graphics.ES20.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES20.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+            Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES20.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES20.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33207,13 +33139,13 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* sources_ptr = &sources)
-                    fixed (OpenTK.Graphics.ES20.All* types_ptr = &types)
+                    fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = &sources)
+                    fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = &types)
                     fixed (Int32* ids_ptr = &ids)
-                    fixed (OpenTK.Graphics.ES20.All* severities_ptr = &severities)
+                    fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = &severities)
                     fixed (Int32* lengths_ptr = &lengths)
                     {
-                        Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                        Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                         sources = *sources_ptr;
                         types = *types_ptr;
                         ids = *ids_ptr;
@@ -33274,13 +33206,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+            unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources, (OpenTK.Graphics.ES20.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+                return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources, (OpenTK.Graphics.ES20.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
                 #if DEBUG
                 }
                 #endif
@@ -33333,7 +33265,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All[] sources, [OutAttribute] OpenTK.Graphics.ES20.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES20.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
+            Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33341,13 +33273,13 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* sources_ptr = sources)
-                    fixed (OpenTK.Graphics.ES20.All* types_ptr = types)
+                    fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = sources)
+                    fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = types)
                     fixed (UInt32* ids_ptr = ids)
-                    fixed (OpenTK.Graphics.ES20.All* severities_ptr = severities)
+                    fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = severities)
                     fixed (Int32* lengths_ptr = lengths)
                     {
-                        return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                        return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                     }
                 }
                 #if DEBUG
@@ -33402,7 +33334,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.All sources, [OutAttribute] out OpenTK.Graphics.ES20.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES20.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
+            Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES20.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES20.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES20.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33410,13 +33342,13 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* sources_ptr = &sources)
-                    fixed (OpenTK.Graphics.ES20.All* types_ptr = &types)
+                    fixed (OpenTK.Graphics.ES20.DebugSourceExternal* sources_ptr = &sources)
+                    fixed (OpenTK.Graphics.ES20.DebugType* types_ptr = &types)
                     fixed (UInt32* ids_ptr = &ids)
-                    fixed (OpenTK.Graphics.ES20.All* severities_ptr = &severities)
+                    fixed (OpenTK.Graphics.ES20.DebugSeverity* severities_ptr = &severities)
                     fixed (Int32* lengths_ptr = &lengths)
                     {
-                        Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources_ptr, (OpenTK.Graphics.ES20.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
+                        Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES20.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES20.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog);
                         sources = *sources_ptr;
                         types = *types_ptr;
                         ids = *ids_ptr;
@@ -33477,13 +33409,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")]
             public static 
-            unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
+            unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.All*)sources, (OpenTK.Graphics.ES20.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.All*)severities, (Int32*)lengths, (StringBuilder)messageLog);
+                return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES20.DebugSourceExternal*)sources, (OpenTK.Graphics.ES20.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES20.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog);
                 #if DEBUG
                 }
                 #endif
@@ -33520,7 +33452,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+            void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33530,7 +33462,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = length)
                     {
-                        Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                        Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     }
                 }
                 #if DEBUG
@@ -33569,7 +33501,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+            void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33579,7 +33511,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = &length)
                     {
-                        Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                        Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                         length = *length_ptr;
                     }
                 }
@@ -33620,13 +33552,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            unsafe void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+            unsafe void GetObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+                Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
                 #if DEBUG
                 }
                 #endif
@@ -33664,7 +33596,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+            void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33674,7 +33606,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = length)
                     {
-                        Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                        Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     }
                 }
                 #if DEBUG
@@ -33714,7 +33646,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+            void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33724,7 +33656,7 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = &length)
                     {
-                        Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                        Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                         length = *length_ptr;
                     }
                 }
@@ -33765,13 +33697,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetObjectLabelKHR")]
             public static 
-            unsafe void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+            unsafe void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+                Delegates.glGetObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
                 #if DEBUG
                 }
                 #endif
@@ -34666,13 +34598,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glObjectLabelKHR")]
             public static 
-            void ObjectLabel(OpenTK.Graphics.ES20.All identifier, Int32 name, Int32 length, String label)
+            void ObjectLabel(ObjectLabelIdentifier identifier, Int32 name, Int32 length, String label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)length, (String)label);
+                Delegates.glObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
                 #if DEBUG
                 }
                 #endif
@@ -34705,13 +34637,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glObjectLabelKHR")]
             public static 
-            void ObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label)
+            void ObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glObjectLabelKHR((OpenTK.Graphics.ES20.All)identifier, (UInt32)name, (Int32)length, (String)label);
+                Delegates.glObjectLabelKHR((ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
                 #if DEBUG
                 }
                 #endif
@@ -35074,52 +35006,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferNV")]
             public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, Int32 mask, OpenTK.Graphics.ES20.All filter)
+            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-                    /// <summary>[requires: NV_framebuffer_blit]
-                    /// Copy a block of pixels from the read framebuffer to the draw framebuffer
-                    /// </summary>
-                    /// <param name="srcX0">
-                    /// <para>
-                    /// Specify the bounds of the source rectangle within the read buffer of the read framebuffer.
-                    /// </para>
-                    /// </param>
-                    /// <param name="dstX0">
-                    /// <para>
-                    /// Specify the bounds of the destination rectangle within the write buffer of the write framebuffer.
-                    /// </para>
-                    /// </param>
-                    /// <param name="mask">
-                    /// <para>
-                    /// The bitwise OR of the flags indicating which buffers are to be copied. The allowed flags are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT and GL_STENCIL_BUFFER_BIT.
-                    /// </para>
-                    /// </param>
-                    /// <param name="filter">
-                    /// <para>
-                    /// Specifies the interpolation to be applied if the image is stretched. Must be GL_NEAREST or GL_LINEAR.
-                    /// </para>
-                    /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NV_framebuffer_blit", Version = "", EntryPoint = "glBlitFramebufferNV")]
-            public static 
-            void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (UInt32)mask, (OpenTK.Graphics.ES20.All)filter);
+                Delegates.glBlitFramebufferNV((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.ES20.ClearBufferMask)mask, (OpenTK.Graphics.ES20.BlitFramebufferFilter)filter);
                 #if DEBUG
                 }
                 #endif
@@ -35156,13 +35049,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_copy_buffer", Version = "", EntryPoint = "glCopyBufferSubDataNV")]
             public static 
-            void CopyBufferSubData(OpenTK.Graphics.ES20.All readTarget, OpenTK.Graphics.ES20.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
+            void CopyBufferSubData(OpenTK.Graphics.ES20.BufferTarget readTarget, OpenTK.Graphics.ES20.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCopyBufferSubDataNV((OpenTK.Graphics.ES20.All)readTarget, (OpenTK.Graphics.ES20.All)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
+                Delegates.glCopyBufferSubDataNV((OpenTK.Graphics.ES20.BufferTarget)readTarget, (OpenTK.Graphics.ES20.BufferTarget)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
                 #if DEBUG
                 }
                 #endif
@@ -35370,7 +35263,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_buffers", Version = "", EntryPoint = "glDrawBuffersNV")]
             public static 
-            void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.All[] bufs)
+            void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode[] bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -35378,9 +35271,9 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* bufs_ptr = bufs)
+                    fixed (OpenTK.Graphics.ES20.DrawBufferMode* bufs_ptr = bufs)
                     {
-                        Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.All*)bufs_ptr);
+                        Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs_ptr);
                     }
                 }
                 #if DEBUG
@@ -35404,7 +35297,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_buffers", Version = "", EntryPoint = "glDrawBuffersNV")]
             public static 
-            void DrawBuffers(Int32 n, ref OpenTK.Graphics.ES20.All bufs)
+            void DrawBuffers(Int32 n, ref OpenTK.Graphics.ES20.DrawBufferMode bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -35412,9 +35305,9 @@ namespace OpenTK.Graphics.ES20
                 #endif
                 unsafe
                 {
-                    fixed (OpenTK.Graphics.ES20.All* bufs_ptr = &bufs)
+                    fixed (OpenTK.Graphics.ES20.DrawBufferMode* bufs_ptr = &bufs)
                     {
-                        Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.All*)bufs_ptr);
+                        Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs_ptr);
                     }
                 }
                 #if DEBUG
@@ -35439,13 +35332,13 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NV_draw_buffers", Version = "", EntryPoint = "glDrawBuffersNV")]
             public static 
-            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.All* bufs)
+            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.All*)bufs);
+                Delegates.glDrawBuffersNV((Int32)n, (OpenTK.Graphics.ES20.DrawBufferMode*)bufs);
                 #if DEBUG
                 }
                 #endif
@@ -35482,13 +35375,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_instanced", Version = "", EntryPoint = "glDrawElementsInstancedNV")]
             public static 
-            void DrawElementsInstanced(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount)
+            void DrawElementsInstanced(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices, (Int32)primcount);
+                Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
                 #if DEBUG
                 }
                 #endif
@@ -35525,7 +35418,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_instanced", Version = "", EntryPoint = "glDrawElementsInstancedNV")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -35535,7 +35428,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -35577,7 +35470,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_instanced", Version = "", EntryPoint = "glDrawElementsInstancedNV")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -35587,7 +35480,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -35629,7 +35522,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_instanced", Version = "", EntryPoint = "glDrawElementsInstancedNV")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -35639,7 +35532,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 }
                 finally
                 {
@@ -35681,7 +35574,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_draw_instanced", Version = "", EntryPoint = "glDrawElementsInstancedNV")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -35691,7 +35584,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.All)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    Delegates.glDrawElementsInstancedNV((OpenTK.Graphics.ES20.PrimitiveType)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                     indices = (T3)indices_ptr.Target;
                 }
                 finally
@@ -36059,13 +35952,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "NV_framebuffer_multisample", Version = "", EntryPoint = "glRenderbufferStorageMultisampleNV")]
             public static 
-            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height)
+            void RenderbufferStorageMultisample(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glRenderbufferStorageMultisampleNV((OpenTK.Graphics.ES20.All)target, (Int32)samples, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height);
+                Delegates.glRenderbufferStorageMultisampleNV((OpenTK.Graphics.ES20.RenderbufferTarget)target, (Int32)samples, (OpenTK.Graphics.ES20.RenderbufferInternalFormat)internalformat, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -36640,13 +36533,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
+            void CompressedTexImage3D(TextureTarget3d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
+                Delegates.glCompressedTexImage3DOES((TextureTarget3d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -36703,7 +36596,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+            void CompressedTexImage3D<T8>(TextureTarget3d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -36713,7 +36606,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexImage3DOES((TextureTarget3d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -36775,7 +36668,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data)
+            void CompressedTexImage3D<T8>(TextureTarget3d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -36785,7 +36678,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexImage3DOES((TextureTarget3d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -36847,7 +36740,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+            void CompressedTexImage3D<T8>(TextureTarget3d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -36857,7 +36750,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexImage3DOES((TextureTarget3d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -36919,7 +36812,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+            void CompressedTexImage3D<T8>(TextureTarget3d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -36929,7 +36822,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexImage3DOES((TextureTarget3d)target, (Int32)level, (CompressedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                     data = (T8)data_ptr.Target;
                 }
                 finally
@@ -36997,13 +36890,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D(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)
+            void CompressedTexSubImage3D(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCompressedTexSubImage3DOES((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);
+                Delegates.glCompressedTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -37065,7 +36958,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(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, [InAttribute, OutAttribute] T10[] data)
+            void CompressedTexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -37075,7 +36968,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DOES((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_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37142,7 +37035,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(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, [InAttribute, OutAttribute] T10[,] data)
+            void CompressedTexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[,] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -37152,7 +37045,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DOES((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_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37219,7 +37112,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(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, [InAttribute, OutAttribute] T10[,,] data)
+            void CompressedTexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -37229,7 +37122,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DOES((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_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37296,7 +37189,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(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, [InAttribute, OutAttribute] ref T10 data)
+            void CompressedTexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -37306,7 +37199,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DOES((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_ptr.AddrOfPinnedObject());
+                    Delegates.glCompressedTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
                     data = (T10)data_ptr.Target;
                 }
                 finally
@@ -37364,13 +37257,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glCopyTexSubImage3DOES")]
             public static 
-            void CopyTexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height)
+            void CopyTexSubImage3D(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCopyTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
+                Delegates.glCopyTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
                 #if DEBUG
                 }
                 #endif
@@ -37834,13 +37727,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params)
+            void GetBufferPointer(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params);
+                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params);
                 #if DEBUG
                 }
                 #endif
@@ -37849,7 +37742,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37859,7 +37752,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37873,7 +37766,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37883,7 +37776,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37897,7 +37790,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37907,7 +37800,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -37921,7 +37814,7 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T2 @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -37931,7 +37824,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
                     @params = (T2)@params_ptr.Target;
                 }
                 finally
@@ -40225,13 +40118,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
+            void TexImage3D(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
+                Delegates.glTexImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -40293,7 +40186,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[] pixels)
+            void TexImage3D<T9>(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -40303,7 +40196,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40370,7 +40263,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[,] pixels)
+            void TexImage3D<T9>(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T9[,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -40380,7 +40273,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40447,7 +40340,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TexImage3D<T9>(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -40457,7 +40350,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40524,7 +40417,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T9 pixels)
+            void TexImage3D<T9>(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -40534,7 +40427,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                     pixels = (T9)pixels_ptr.Target;
                 }
                 finally
@@ -40607,13 +40500,13 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
+            void TexSubImage3D(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
+                Delegates.glTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -40680,7 +40573,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[] pixels)
+            void TexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -40690,7 +40583,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40762,7 +40655,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,] pixels)
+            void TexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -40772,7 +40665,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40844,7 +40737,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -40854,7 +40747,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
@@ -40926,7 +40819,7 @@ namespace OpenTK.Graphics.ES20
                     /// </param>
             [AutoGenerated(Category = "OES_texture_3D", Version = "", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T10 pixels)
+            void TexSubImage3D<T10>(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T10 pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -40936,7 +40829,7 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    Delegates.glTexSubImage3DOES((TextureTarget3d)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
                     pixels = (T10)pixels_ptr.Target;
                 }
                 finally
@@ -40951,13 +40844,13 @@ namespace OpenTK.Graphics.ES20
             /// <summary>[requires: OES_mapbuffer]</summary>
             [AutoGenerated(Category = "OES_mapbuffer", Version = "", EntryPoint = "glUnmapBufferOES")]
             public static 
-            bool UnmapBuffer(OpenTK.Graphics.ES20.All target)
+            bool UnmapBuffer(OpenTK.Graphics.ES20.BufferTarget target)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glUnmapBufferOES((OpenTK.Graphics.ES20.All)target);
+                return Delegates.glUnmapBufferOES((OpenTK.Graphics.ES20.BufferTarget)target);
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/ES20/ES20Core.cs b/Source/OpenTK/Graphics/ES20/ES20Core.cs
index d6969e18..e15f6beb 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Core.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Core.cs
@@ -59,7 +59,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BeginPerfMonitorAMD(UInt32 monitor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginQueryEXT", ExactSpelling = true)]
-            internal extern static void BeginQueryEXT(OpenTK.Graphics.ES20.All target, UInt32 id);
+            internal extern static void BeginQueryEXT(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindAttribLocation", ExactSpelling = true)]
             internal extern static void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -92,7 +92,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationEXT", ExactSpelling = true)]
-            internal extern static void BlendEquationEXT(OpenTK.Graphics.ES20.All mode);
+            internal extern static void BlendEquationEXT(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.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
@@ -101,19 +101,19 @@ namespace OpenTK.Graphics.ES20
             internal extern static void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDest dfactor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
-            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.All sfactorRGB, OpenTK.Graphics.ES20.All dfactorRGB, OpenTK.Graphics.ES20.All sfactorAlpha, OpenTK.Graphics.ES20.All dfactorAlpha);
+            internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES20.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES20.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dfactorAlpha);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendParameteriNV", ExactSpelling = true)]
             internal extern static void BlendParameteriNV(OpenTK.Graphics.ES20.All pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlitFramebufferANGLE", ExactSpelling = true)]
-            internal extern static void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter);
+            internal extern static void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlitFramebufferNV", ExactSpelling = true)]
-            internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter);
+            internal extern static void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferData", ExactSpelling = true)]
-            internal extern static void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
+            internal extern static void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, BufferUsageHint usage);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferSubData", ExactSpelling = true)]
             internal extern static void BufferSubData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data);
@@ -134,7 +134,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void ClearStencil(Int32 s);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSyncAPPLE", ExactSpelling = true)]
-            internal extern static OpenTK.Graphics.ES20.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal extern static WaitSyncStatus ClientWaitSyncAPPLE(IntPtr sync, ClientWaitSyncFlags flags, UInt64 timeout);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glColorMask", ExactSpelling = true)]
             internal extern static void ColorMask(bool red, bool green, bool blue, bool alpha);
@@ -143,28 +143,28 @@ namespace OpenTK.Graphics.ES20
             internal extern static void CompileShader(UInt32 shader);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCompressedTexImage2D", ExactSpelling = true)]
-            internal extern static void CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data);
+            internal extern static void CompressedTexImage2D(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCompressedTexImage3DOES", ExactSpelling = true)]
-            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);
+            internal extern static void CompressedTexImage3DOES(TextureTarget3d target, Int32 level, CompressedInternalFormat 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.PixelFormat format, Int32 imageSize, IntPtr data);
+            internal extern static void CompressedTexSubImage2D(TextureTarget2d 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);
+            internal extern static void CompressedTexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyBufferSubDataNV", ExactSpelling = true)]
-            internal extern static void CopyBufferSubDataNV(OpenTK.Graphics.ES20.All readTarget, OpenTK.Graphics.ES20.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal extern static void CopyBufferSubDataNV(OpenTK.Graphics.ES20.BufferTarget readTarget, OpenTK.Graphics.ES20.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyTexImage2D", ExactSpelling = true)]
-            internal extern static void CopyTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
+            internal extern static void CopyTexImage2D(TextureTarget2d target, Int32 level, TextureCopyComponentCount internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyTexSubImage2D", ExactSpelling = true)]
-            internal extern static void CopyTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal extern static void CopyTexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyTexSubImage3DOES", ExactSpelling = true)]
-            internal extern static void CopyTexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal extern static void CopyTexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyTextureLevelsAPPLE", ExactSpelling = true)]
             internal extern static void CopyTextureLevelsAPPLE(UInt32 destinationTexture, UInt32 sourceTexture, Int32 sourceBaseLevel, Int32 sourceLevelCount);
@@ -197,16 +197,16 @@ namespace OpenTK.Graphics.ES20
             internal extern static void DebugMessageCallbackKHR(DebugProcKhr callback, IntPtr userParam);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControl", ExactSpelling = true)]
-            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControlKHR", ExactSpelling = true)]
-            internal extern static unsafe void DebugMessageControlKHR(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal extern static unsafe void DebugMessageControlKHR(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageInsert", ExactSpelling = true)]
-            internal extern static void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf);
+            internal extern static void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageInsertKHR", ExactSpelling = true)]
-            internal extern static void DebugMessageInsertKHR(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf);
+            internal extern static void DebugMessageInsertKHR(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDeleteBuffers", ExactSpelling = true)]
             internal extern static unsafe void DeleteBuffers(Int32 n, UInt32* buffers);
@@ -284,13 +284,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static void DrawArraysInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 first, Int32 count, Int32 primcount);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawBuffersEXT", ExactSpelling = true)]
-            internal extern static unsafe void DrawBuffersEXT(Int32 n, OpenTK.Graphics.ES20.All* bufs);
+            internal extern static unsafe void DrawBuffersEXT(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawBuffersIndexedEXT", ExactSpelling = true)]
             internal extern static unsafe void DrawBuffersIndexedEXT(Int32 n, OpenTK.Graphics.ES20.All* location, Int32* indices);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawBuffersNV", ExactSpelling = true)]
-            internal extern static unsafe void DrawBuffersNV(Int32 n, OpenTK.Graphics.ES20.All* bufs);
+            internal extern static unsafe void DrawBuffersNV(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawElements", ExactSpelling = true)]
             internal extern static void DrawElements(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
@@ -299,13 +299,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static void DrawElements1(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawElementsInstancedANGLE", ExactSpelling = true)]
-            internal extern static void DrawElementsInstancedANGLE(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount);
+            internal extern static void DrawElementsInstancedANGLE(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawElementsInstancedEXT", ExactSpelling = true)]
             internal extern static void DrawElementsInstancedEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawElementsInstancedNV", ExactSpelling = true)]
-            internal extern static void DrawElementsInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount);
+            internal extern static void DrawElementsInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             [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);
@@ -326,7 +326,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void EndPerfMonitorAMD(UInt32 monitor);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndQueryEXT", ExactSpelling = true)]
-            internal extern static void EndQueryEXT(OpenTK.Graphics.ES20.All target);
+            internal extern static void EndQueryEXT(OpenTK.Graphics.ES20.QueryTarget target);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndTilingQCOM", ExactSpelling = true)]
             internal extern static void EndTilingQCOM(UInt32 preserveMask);
@@ -368,7 +368,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void ExtTexObjectStateOverrideiQCOM(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, Int32 param);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFenceSyncAPPLE", ExactSpelling = true)]
-            internal extern static IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES20.All condition, UInt32 flags);
+            internal extern static IntPtr FenceSyncAPPLE(SyncCondition condition, WaitSyncFlags flags);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFinish", ExactSpelling = true)]
             internal extern static void Finish();
@@ -380,13 +380,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static void Flush();
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFlushMappedBufferRangeEXT", ExactSpelling = true)]
-            internal extern static void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length);
+            internal extern static void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFramebufferRenderbuffer", ExactSpelling = true)]
             internal extern static void FramebufferRenderbuffer(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.RenderbufferTarget renderbuffertarget, UInt32 renderbuffer);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFramebufferTexture2D", ExactSpelling = true)]
-            internal extern static void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.TextureTarget textarget, UInt32 texture, Int32 level);
+            internal extern static void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, TextureTarget2d textarget, UInt32 texture, Int32 level);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFramebufferTexture2DMultisampleEXT", ExactSpelling = true)]
             internal extern static void FramebufferTexture2DMultisampleEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.All textarget, UInt32 texture, Int32 level, Int32 samples);
@@ -449,13 +449,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetBufferParameteriv(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetBufferPointervOES", ExactSpelling = true)]
-            internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params);
+            internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLog", ExactSpelling = true)]
-            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLogKHR", ExactSpelling = true)]
-            internal extern static unsafe Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal extern static unsafe Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDriverControlsQCOM", ExactSpelling = true)]
             internal extern static unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls);
@@ -473,16 +473,16 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetFloatv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Single* data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetFramebufferAttachmentParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void GetFramebufferAttachmentParameteriv(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetFramebufferAttachmentParameteriv(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetGraphicsResetStatusEXT", ExactSpelling = true)]
             internal extern static OpenTK.Graphics.ES20.All GetGraphicsResetStatusEXT();
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInteger64vAPPLE", ExactSpelling = true)]
-            internal extern static unsafe void GetInteger64vAPPLE(OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetInteger64vAPPLE(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetIntegeri_vEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetIntegeri_vEXT(OpenTK.Graphics.ES20.All target, UInt32 index, [OutAttribute] Int32* data);
+            internal extern static unsafe void GetIntegeri_vEXT(GetIndexedPName target, UInt32 index, [OutAttribute] Int32* data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetIntegerv", ExactSpelling = true)]
             internal extern static unsafe void GetIntegerv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int32* data);
@@ -494,13 +494,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetnUniformivEXT(UInt32 program, Int32 location, Int32 bufSize, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectLabel", ExactSpelling = true)]
-            internal extern static unsafe void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal extern static unsafe void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectLabelEXT", ExactSpelling = true)]
             internal extern static unsafe void GetObjectLabelEXT(OpenTK.Graphics.ES20.All type, UInt32 @object, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectLabelKHR", ExactSpelling = true)]
-            internal extern static unsafe void GetObjectLabelKHR(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal extern static unsafe void GetObjectLabelKHR(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectPtrLabel", ExactSpelling = true)]
             internal extern static unsafe void GetObjectPtrLabel(IntPtr ptr, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
@@ -548,19 +548,19 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetProgramPipelineivEXT(UInt32 pipeline, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryivEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryivEXT(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjecti64vEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectui64vEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64* @params);
+            internal extern static unsafe void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetQueryObjectuivEXT", ExactSpelling = true)]
-            internal extern static unsafe void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32* @params);
+            internal extern static unsafe void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetRenderbufferParameteriv", ExactSpelling = true)]
             internal extern static unsafe void GetRenderbufferParameteriv(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
@@ -581,13 +581,13 @@ namespace OpenTK.Graphics.ES20
             internal extern static IntPtr GetString(OpenTK.Graphics.ES20.StringName name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSyncivAPPLE", ExactSpelling = true)]
-            internal extern static unsafe void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES20.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal extern static unsafe void GetSyncivAPPLE(IntPtr sync, SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             [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);
+            internal extern static unsafe void GetTexParameterfv(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Single* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTexParameteriv", ExactSpelling = true)]
-            internal extern static unsafe void GetTexParameteriv(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetTexParameteriv(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTranslatedShaderSourceANGLE", ExactSpelling = true)]
             internal extern static unsafe void GetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -665,7 +665,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static IntPtr MapBufferOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All access);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBufferRangeEXT", ExactSpelling = true)]
-            internal extern static IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access);
+            internal extern static IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMultiDrawArraysEXT", ExactSpelling = true)]
             internal extern static unsafe void MultiDrawArraysEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* first, Int32* count, Int32 primcount);
@@ -674,10 +674,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void MultiDrawElementsEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glObjectLabel", ExactSpelling = true)]
-            internal extern static void ObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label);
+            internal extern static void ObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glObjectLabelKHR", ExactSpelling = true)]
-            internal extern static void ObjectLabelKHR(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label);
+            internal extern static void ObjectLabelKHR(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glObjectPtrLabel", ExactSpelling = true)]
             internal extern static void ObjectPtrLabel(IntPtr ptr, Int32 length, String label);
@@ -704,7 +704,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramParameteriEXT", ExactSpelling = true)]
-            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value);
+            internal extern static void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glProgramUniform1fEXT", ExactSpelling = true)]
             internal extern static void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
@@ -836,19 +836,19 @@ namespace OpenTK.Graphics.ES20
             internal extern static void RenderbufferStorage(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glRenderbufferStorageMultisampleANGLE", ExactSpelling = true)]
-            internal extern static void RenderbufferStorageMultisampleANGLE(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void RenderbufferStorageMultisampleANGLE(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glRenderbufferStorageMultisampleAPPLE", ExactSpelling = true)]
-            internal extern static void RenderbufferStorageMultisampleAPPLE(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void RenderbufferStorageMultisampleAPPLE(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glRenderbufferStorageMultisampleEXT", ExactSpelling = true)]
-            internal extern static void RenderbufferStorageMultisampleEXT(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void RenderbufferStorageMultisampleEXT(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glRenderbufferStorageMultisampleIMG", ExactSpelling = true)]
-            internal extern static void RenderbufferStorageMultisampleIMG(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void RenderbufferStorageMultisampleIMG(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glRenderbufferStorageMultisampleNV", ExactSpelling = true)]
-            internal extern static void RenderbufferStorageMultisampleNV(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void RenderbufferStorageMultisampleNV(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glResolveMultisampleFramebufferAPPLE", ExactSpelling = true)]
             internal extern static void ResolveMultisampleFramebufferAPPLE();
@@ -902,10 +902,10 @@ namespace OpenTK.Graphics.ES20
             internal extern static bool TestFenceNV(UInt32 fence);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage2D", ExactSpelling = true)]
-            internal extern static void TexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
+            internal extern static void TexImage2D(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3DOES", ExactSpelling = true)]
-            internal extern static void TexImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
+            internal extern static void TexImage3DOES(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexParameterf", ExactSpelling = true)]
             internal extern static void TexParameterf(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Single param);
@@ -923,16 +923,16 @@ namespace OpenTK.Graphics.ES20
             internal extern static void TexStorage1DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage2DEXT", ExactSpelling = true)]
-            internal extern static void TexStorage2DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal extern static void TexStorage2DEXT(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage3DEXT", ExactSpelling = true)]
-            internal extern static void TexStorage3DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth);
+            internal extern static void TexStorage3DEXT(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexSubImage2D", ExactSpelling = true)]
-            internal extern static void TexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
+            internal extern static void TexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexSubImage3DOES", ExactSpelling = true)]
-            internal extern static void TexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
+            internal extern static void TexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTextureStorage1DEXT", ExactSpelling = true)]
             internal extern static void TextureStorage1DEXT(UInt32 texture, OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width);
@@ -1019,7 +1019,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void UniformMatrix4x3fvNV(Int32 location, Int32 count, bool transpose, Single* value);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUnmapBufferOES", ExactSpelling = true)]
-            internal extern static bool UnmapBufferOES(OpenTK.Graphics.ES20.All target);
+            internal extern static bool UnmapBufferOES(OpenTK.Graphics.ES20.BufferTarget target);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUseProgram", ExactSpelling = true)]
             internal extern static void UseProgram(UInt32 program);
@@ -1076,7 +1076,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glWaitSyncAPPLE", ExactSpelling = true)]
-            internal extern static void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal extern static void WaitSyncAPPLE(IntPtr sync, WaitSyncFlags flags, UInt64 timeout);
         }
     }
 }
diff --git a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
index 0e53bfb4..b4d172ee 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Delegates.cs
@@ -57,7 +57,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BeginPerfMonitorAMD(UInt32 monitor);
             internal static BeginPerfMonitorAMD glBeginPerfMonitorAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BeginQueryEXT(OpenTK.Graphics.ES20.All target, UInt32 id);
+            internal delegate void BeginQueryEXT(OpenTK.Graphics.ES20.QueryTarget target, UInt32 id);
             internal static BeginQueryEXT glBeginQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BindAttribLocation(UInt32 program, UInt32 index, String name);
@@ -90,7 +90,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BlendEquation(OpenTK.Graphics.ES20.BlendEquationMode mode);
             internal static BlendEquation glBlendEquation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendEquationEXT(OpenTK.Graphics.ES20.All mode);
+            internal delegate void BlendEquationEXT(OpenTK.Graphics.ES20.BlendEquationMode mode);
             internal static BlendEquationEXT glBlendEquationEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
@@ -99,19 +99,19 @@ namespace OpenTK.Graphics.ES20
             internal delegate void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDest dfactor);
             internal static BlendFunc glBlendFunc;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.All sfactorRGB, OpenTK.Graphics.ES20.All dfactorRGB, OpenTK.Graphics.ES20.All sfactorAlpha, OpenTK.Graphics.ES20.All dfactorAlpha);
+            internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc sfactorRGB, OpenTK.Graphics.ES20.BlendingFactorDest dfactorRGB, OpenTK.Graphics.ES20.BlendingFactorSrc sfactorAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dfactorAlpha);
             internal static BlendFuncSeparate glBlendFuncSeparate;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendParameteriNV(OpenTK.Graphics.ES20.All pname, Int32 value);
             internal static BlendParameteriNV glBlendParameteriNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter);
+            internal delegate void BlitFramebufferANGLE(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             internal static BlitFramebufferANGLE glBlitFramebufferANGLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, UInt32 mask, OpenTK.Graphics.ES20.All filter);
+            internal delegate void BlitFramebufferNV(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.ES20.ClearBufferMask mask, OpenTK.Graphics.ES20.BlitFramebufferFilter filter);
             internal static BlitFramebufferNV glBlitFramebufferNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
+            internal delegate void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, BufferUsageHint usage);
             internal static BufferData glBufferData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BufferSubData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data);
@@ -132,7 +132,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void ClearStencil(Int32 s);
             internal static ClearStencil glClearStencil;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate OpenTK.Graphics.ES20.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal delegate WaitSyncStatus ClientWaitSyncAPPLE(IntPtr sync, ClientWaitSyncFlags flags, UInt64 timeout);
             internal static ClientWaitSyncAPPLE glClientWaitSyncAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ColorMask(bool red, bool green, bool blue, bool alpha);
@@ -141,28 +141,28 @@ namespace OpenTK.Graphics.ES20
             internal delegate void CompileShader(UInt32 shader);
             internal static CompileShader glCompileShader;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data);
+            internal delegate void CompressedTexImage2D(TextureTarget2d target, Int32 level, CompressedInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data);
             internal static CompressedTexImage2D glCompressedTexImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            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 delegate void CompressedTexImage3DOES(TextureTarget3d target, Int32 level, CompressedInternalFormat 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.PixelFormat format, Int32 imageSize, IntPtr data);
+            internal delegate void CompressedTexSubImage2D(TextureTarget2d 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);
+            internal delegate void CompressedTexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data);
             internal static CompressedTexSubImage3DOES glCompressedTexSubImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyBufferSubDataNV(OpenTK.Graphics.ES20.All readTarget, OpenTK.Graphics.ES20.All writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal delegate void CopyBufferSubDataNV(OpenTK.Graphics.ES20.BufferTarget readTarget, OpenTK.Graphics.ES20.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             internal static CopyBufferSubDataNV glCopyBufferSubDataNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
+            internal delegate void CopyTexImage2D(TextureTarget2d target, Int32 level, TextureCopyComponentCount internalformat, Int32 x, Int32 y, Int32 width, Int32 height, Int32 border);
             internal static CopyTexImage2D glCopyTexImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal delegate void CopyTexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 x, Int32 y, Int32 width, Int32 height);
             internal static CopyTexSubImage2D glCopyTexSubImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyTexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal delegate void CopyTexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 x, Int32 y, Int32 width, Int32 height);
             internal static CopyTexSubImage3DOES glCopyTexSubImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void CopyTextureLevelsAPPLE(UInt32 destinationTexture, UInt32 sourceTexture, Int32 sourceBaseLevel, Int32 sourceLevelCount);
@@ -195,16 +195,16 @@ namespace OpenTK.Graphics.ES20
             internal delegate void DebugMessageCallbackKHR(DebugProcKhr callback, IntPtr userParam);
             internal static DebugMessageCallbackKHR glDebugMessageCallbackKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageControl glDebugMessageControl;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DebugMessageControlKHR(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, UInt32* ids, bool enabled);
+            internal unsafe delegate void DebugMessageControlKHR(OpenTK.Graphics.ES20.DebugSourceControl source, OpenTK.Graphics.ES20.DebugTypeControl type, OpenTK.Graphics.ES20.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageControlKHR glDebugMessageControlKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf);
+            internal delegate void DebugMessageInsert(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf);
             internal static DebugMessageInsert glDebugMessageInsert;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DebugMessageInsertKHR(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, UInt32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf);
+            internal delegate void DebugMessageInsertKHR(OpenTK.Graphics.ES20.DebugSourceExternal source, OpenTK.Graphics.ES20.DebugType type, UInt32 id, OpenTK.Graphics.ES20.DebugSeverity severity, Int32 length, String buf);
             internal static DebugMessageInsertKHR glDebugMessageInsertKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void DeleteBuffers(Int32 n, UInt32* buffers);
@@ -282,13 +282,13 @@ namespace OpenTK.Graphics.ES20
             internal delegate void DrawArraysInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 first, Int32 count, Int32 primcount);
             internal static DrawArraysInstancedNV glDrawArraysInstancedNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DrawBuffersEXT(Int32 n, OpenTK.Graphics.ES20.All* bufs);
+            internal unsafe delegate void DrawBuffersEXT(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs);
             internal unsafe static DrawBuffersEXT glDrawBuffersEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void DrawBuffersIndexedEXT(Int32 n, OpenTK.Graphics.ES20.All* location, Int32* indices);
             internal unsafe static DrawBuffersIndexedEXT glDrawBuffersIndexedEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DrawBuffersNV(Int32 n, OpenTK.Graphics.ES20.All* bufs);
+            internal unsafe delegate void DrawBuffersNV(Int32 n, OpenTK.Graphics.ES20.DrawBufferMode* bufs);
             internal unsafe static DrawBuffersNV glDrawBuffersNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DrawElements(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
@@ -297,13 +297,13 @@ namespace OpenTK.Graphics.ES20
             internal delegate void DrawElements1(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices);
             internal static DrawElements1 glDrawElements1;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DrawElementsInstancedANGLE(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount);
+            internal delegate void DrawElementsInstancedANGLE(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             internal static DrawElementsInstancedANGLE glDrawElementsInstancedANGLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DrawElementsInstancedEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             internal static DrawElementsInstancedEXT glDrawElementsInstancedEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DrawElementsInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.All type, IntPtr indices, Int32 primcount);
+            internal delegate void DrawElementsInstancedNV(OpenTK.Graphics.ES20.PrimitiveType mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             internal static DrawElementsInstancedNV glDrawElementsInstancedNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EGLImageTargetRenderbufferStorageOES(OpenTK.Graphics.ES20.All target, IntPtr image);
@@ -324,7 +324,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void EndPerfMonitorAMD(UInt32 monitor);
             internal static EndPerfMonitorAMD glEndPerfMonitorAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void EndQueryEXT(OpenTK.Graphics.ES20.All target);
+            internal delegate void EndQueryEXT(OpenTK.Graphics.ES20.QueryTarget target);
             internal static EndQueryEXT glEndQueryEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndTilingQCOM(UInt32 preserveMask);
@@ -366,7 +366,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void ExtTexObjectStateOverrideiQCOM(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, Int32 param);
             internal static ExtTexObjectStateOverrideiQCOM glExtTexObjectStateOverrideiQCOM;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES20.All condition, UInt32 flags);
+            internal delegate IntPtr FenceSyncAPPLE(SyncCondition condition, WaitSyncFlags flags);
             internal static FenceSyncAPPLE glFenceSyncAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Finish();
@@ -378,13 +378,13 @@ namespace OpenTK.Graphics.ES20
             internal delegate void Flush();
             internal static Flush glFlush;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length);
+            internal delegate void FlushMappedBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length);
             internal static FlushMappedBufferRangeEXT glFlushMappedBufferRangeEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void FramebufferRenderbuffer(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.RenderbufferTarget renderbuffertarget, UInt32 renderbuffer);
             internal static FramebufferRenderbuffer glFramebufferRenderbuffer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.TextureTarget textarget, UInt32 texture, Int32 level);
+            internal delegate void FramebufferTexture2D(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, TextureTarget2d textarget, UInt32 texture, Int32 level);
             internal static FramebufferTexture2D glFramebufferTexture2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void FramebufferTexture2DMultisampleEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.All textarget, UInt32 texture, Int32 level, Int32 samples);
@@ -447,13 +447,13 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetBufferParameteriv(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetBufferParameteriv glGetBufferParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params);
+            internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferPointer pname, [OutAttribute] IntPtr @params);
             internal static GetBufferPointervOES glGetBufferPointervOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             internal unsafe static GetDebugMessageLog glGetDebugMessageLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.All* sources, [OutAttribute] OpenTK.Graphics.ES20.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
+            internal unsafe delegate Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES20.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES20.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES20.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog);
             internal unsafe static GetDebugMessageLogKHR glGetDebugMessageLogKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls);
@@ -471,16 +471,16 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetFloatv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Single* data);
             internal unsafe static GetFloatv glGetFloatv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetFramebufferAttachmentParameteriv(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetFramebufferAttachmentParameteriv(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetFramebufferAttachmentParameteriv glGetFramebufferAttachmentParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate OpenTK.Graphics.ES20.All GetGraphicsResetStatusEXT();
             internal static GetGraphicsResetStatusEXT glGetGraphicsResetStatusEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInteger64vAPPLE(OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetInteger64vAPPLE(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int64* @params);
             internal unsafe static GetInteger64vAPPLE glGetInteger64vAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetIntegeri_vEXT(OpenTK.Graphics.ES20.All target, UInt32 index, [OutAttribute] Int32* data);
+            internal unsafe delegate void GetIntegeri_vEXT(GetIndexedPName target, UInt32 index, [OutAttribute] Int32* data);
             internal unsafe static GetIntegeri_vEXT glGetIntegeri_vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetIntegerv(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int32* data);
@@ -492,13 +492,13 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetnUniformivEXT(UInt32 program, Int32 location, Int32 bufSize, [OutAttribute] Int32* @params);
             internal unsafe static GetnUniformivEXT glGetnUniformivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal unsafe delegate void GetObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             internal unsafe static GetObjectLabel glGetObjectLabel;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetObjectLabelEXT(OpenTK.Graphics.ES20.All type, UInt32 @object, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             internal unsafe static GetObjectLabelEXT glGetObjectLabelEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetObjectLabelKHR(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal unsafe delegate void GetObjectLabelKHR(ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             internal unsafe static GetObjectLabelKHR glGetObjectLabelKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetObjectPtrLabel(IntPtr ptr, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
@@ -546,19 +546,19 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetProgramPipelineivEXT(UInt32 pipeline, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
             internal unsafe static GetProgramPipelineivEXT glGetProgramPipelineivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryivEXT(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryivEXT(OpenTK.Graphics.ES20.QueryTarget target, OpenTK.Graphics.ES20.GetQueryParam pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryivEXT glGetQueryivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetQueryObjecti64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int64* @params);
             internal unsafe static GetQueryObjecti64vEXT glGetQueryObjecti64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetQueryObjectivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] Int32* @params);
             internal unsafe static GetQueryObjectivEXT glGetQueryObjectivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt64* @params);
+            internal unsafe delegate void GetQueryObjectui64vEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt64* @params);
             internal unsafe static GetQueryObjectui64vEXT glGetQueryObjectui64vEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.All pname, [OutAttribute] UInt32* @params);
+            internal unsafe delegate void GetQueryObjectuivEXT(UInt32 id, OpenTK.Graphics.ES20.GetQueryObjectParam pname, [OutAttribute] UInt32* @params);
             internal unsafe static GetQueryObjectuivEXT glGetQueryObjectuivEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetRenderbufferParameteriv(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params);
@@ -579,13 +579,13 @@ namespace OpenTK.Graphics.ES20
             internal delegate IntPtr GetString(OpenTK.Graphics.ES20.StringName name);
             internal static GetString glGetString;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetSyncivAPPLE(IntPtr sync, OpenTK.Graphics.ES20.All pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
+            internal unsafe delegate void GetSyncivAPPLE(IntPtr sync, SyncParameterName pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values);
             internal unsafe static GetSyncivAPPLE glGetSyncivAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetTexParameterfv(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single* @params);
+            internal unsafe delegate void GetTexParameterfv(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Single* @params);
             internal unsafe static GetTexParameterfv glGetTexParameterfv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetTexParameteriv(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetTexParameteriv(OpenTK.Graphics.ES20.TextureTarget target, GetTextureParameterName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetTexParameteriv glGetTexParameteriv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source);
@@ -663,7 +663,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate IntPtr MapBufferOES(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All access);
             internal static MapBufferOES glMapBufferOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.All target, IntPtr offset, IntPtr length, UInt32 access);
+            internal delegate IntPtr MapBufferRangeEXT(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr length, UInt32 access);
             internal static MapBufferRangeEXT glMapBufferRangeEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void MultiDrawArraysEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* first, Int32* count, Int32 primcount);
@@ -672,10 +672,10 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void MultiDrawElementsEXT(OpenTK.Graphics.ES20.PrimitiveType mode, Int32* count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices, Int32 primcount);
             internal unsafe static MultiDrawElementsEXT glMultiDrawElementsEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ObjectLabel(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label);
+            internal delegate void ObjectLabel(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label);
             internal static ObjectLabel glObjectLabel;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ObjectLabelKHR(OpenTK.Graphics.ES20.All identifier, UInt32 name, Int32 length, String label);
+            internal delegate void ObjectLabelKHR(ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label);
             internal static ObjectLabelKHR glObjectLabelKHR;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ObjectPtrLabel(IntPtr ptr, Int32 length, String label);
@@ -702,7 +702,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void ProgramBinaryOES(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length);
             internal static ProgramBinaryOES glProgramBinaryOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32 value);
+            internal delegate void ProgramParameteriEXT(UInt32 program, OpenTK.Graphics.ES20.ProgramParameterName pname, Int32 value);
             internal static ProgramParameteriEXT glProgramParameteriEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ProgramUniform1fEXT(UInt32 program, Int32 location, Single v0);
@@ -834,19 +834,19 @@ namespace OpenTK.Graphics.ES20
             internal delegate void RenderbufferStorage(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorage glRenderbufferStorage;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void RenderbufferStorageMultisampleANGLE(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void RenderbufferStorageMultisampleANGLE(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorageMultisampleANGLE glRenderbufferStorageMultisampleANGLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void RenderbufferStorageMultisampleAPPLE(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void RenderbufferStorageMultisampleAPPLE(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorageMultisampleAPPLE glRenderbufferStorageMultisampleAPPLE;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void RenderbufferStorageMultisampleEXT(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void RenderbufferStorageMultisampleEXT(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorageMultisampleEXT glRenderbufferStorageMultisampleEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void RenderbufferStorageMultisampleIMG(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void RenderbufferStorageMultisampleIMG(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorageMultisampleIMG glRenderbufferStorageMultisampleIMG;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void RenderbufferStorageMultisampleNV(OpenTK.Graphics.ES20.All target, Int32 samples, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void RenderbufferStorageMultisampleNV(OpenTK.Graphics.ES20.RenderbufferTarget target, Int32 samples, OpenTK.Graphics.ES20.RenderbufferInternalFormat internalformat, Int32 width, Int32 height);
             internal static RenderbufferStorageMultisampleNV glRenderbufferStorageMultisampleNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ResolveMultisampleFramebufferAPPLE();
@@ -900,10 +900,10 @@ namespace OpenTK.Graphics.ES20
             internal delegate bool TestFenceNV(UInt32 fence);
             internal static TestFenceNV glTestFenceNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
+            internal delegate void TexImage2D(TextureTarget2d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             internal static TexImage2D glTexImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
+            internal delegate void TexImage3DOES(TextureTarget3d target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             internal static TexImage3DOES glTexImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TexParameterf(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Single param);
@@ -921,16 +921,16 @@ namespace OpenTK.Graphics.ES20
             internal delegate void TexStorage1DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width);
             internal static TexStorage1DEXT glTexStorage1DEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexStorage2DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height);
+            internal delegate void TexStorage2DEXT(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height);
             internal static TexStorage2DEXT glTexStorage2DEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexStorage3DEXT(OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth);
+            internal delegate void TexStorage3DEXT(TextureTarget2d target, Int32 levels, SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth);
             internal static TexStorage3DEXT glTexStorage3DEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
+            internal delegate void TexSubImage2D(TextureTarget2d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels);
             internal static TexSubImage2D glTexSubImage2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void TexSubImage3DOES(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
+            internal delegate void TexSubImage3DOES(TextureTarget3d target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels);
             internal static TexSubImage3DOES glTexSubImage3DOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TextureStorage1DEXT(UInt32 texture, OpenTK.Graphics.ES20.All target, Int32 levels, OpenTK.Graphics.ES20.All internalformat, Int32 width);
@@ -1017,7 +1017,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void UniformMatrix4x3fvNV(Int32 location, Int32 count, bool transpose, Single* value);
             internal unsafe static UniformMatrix4x3fvNV glUniformMatrix4x3fvNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate bool UnmapBufferOES(OpenTK.Graphics.ES20.All target);
+            internal delegate bool UnmapBufferOES(OpenTK.Graphics.ES20.BufferTarget target);
             internal static UnmapBufferOES glUnmapBufferOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void UseProgram(UInt32 program);
@@ -1074,7 +1074,7 @@ namespace OpenTK.Graphics.ES20
             internal delegate void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
             internal static Viewport glViewport;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
+            internal delegate void WaitSyncAPPLE(IntPtr sync, WaitSyncFlags flags, UInt64 timeout);
             internal static WaitSyncAPPLE glWaitSyncAPPLE;
         }
     }
diff --git a/Source/OpenTK/Graphics/ES20/ES20Enums.cs b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
index 6af2795f..6f9ced8d 100644
--- a/Source/OpenTK/Graphics/ES20/ES20Enums.cs
+++ b/Source/OpenTK/Graphics/ES20/ES20Enums.cs
@@ -167,7 +167,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 80 other functions
+    /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 39 other functions
     /// </summary>
     public enum All : int
     {
@@ -7917,7 +7917,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BlendEquation, GL.BlendEquationSeparate
+    /// Used in GL.BlendEquation, GL.BlendEquationSeparate and 1 other function
     /// </summary>
     public enum BlendEquationMode : int
     {
@@ -7975,7 +7975,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BlendFunc
+    /// Used in GL.BlendFunc, GL.BlendFuncSeparate
     /// </summary>
     public enum BlendingFactorDest : int
     {
@@ -8058,7 +8058,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BlendFunc
+    /// Used in GL.BlendFunc, GL.BlendFuncSeparate
     /// </summary>
     public enum BlendingFactorSrc : int
     {
@@ -8141,7 +8141,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Angle.BlitFramebuffer, GL.NV.BlitFramebuffer
     /// </summary>
     public enum BlitFramebufferFilter : int
     {
@@ -8186,14 +8186,14 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Oes.GetBufferPointer
     /// </summary>
     public enum BufferPointer : int
     {
     }
 
     /// <summary>
-    /// Used in GL.BindBuffer, GL.BufferData and 2 other functions
+    /// Used in GL.BindBuffer, GL.BufferData and 7 other functions
     /// </summary>
     public enum BufferTarget : int
     {
@@ -8208,7 +8208,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BufferData
+    /// Not used directly.
     /// </summary>
     public enum BufferUsage : int
     {
@@ -8227,7 +8227,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.Clear
+    /// Used in GL.Angle.BlitFramebuffer, GL.Clear and 1 other function
     /// </summary>
     [Flags]
     public enum ClearBufferMask : int
@@ -8644,7 +8644,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions
     /// </summary>
     public enum DebugSeverity : int
     {
@@ -8667,7 +8667,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugSeverityControl : int
     {
@@ -8725,7 +8725,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugSourceControl : int
     {
@@ -8760,7 +8760,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions
     /// </summary>
     public enum DebugSourceExternal : int
     {
@@ -8775,7 +8775,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions
     /// </summary>
     public enum DebugType : int
     {
@@ -8818,7 +8818,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.DebugMessageControl, GL.Khr.DebugMessageControl
     /// </summary>
     public enum DebugTypeControl : int
     {
@@ -8915,7 +8915,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Ext.DrawBuffers, GL.NV.DrawBuffers
     /// </summary>
     public enum DrawBufferMode : int
     {
@@ -8982,7 +8982,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.DrawElements, GL.Ext.DrawElementsInstanced and 1 other function
+    /// Used in GL.Angle.DrawElementsInstanced, GL.DrawElements and 3 other functions
     /// </summary>
     public enum DrawElementsType : int
     {
@@ -11796,7 +11796,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.FramebufferRenderbuffer, GL.FramebufferTexture2D and 1 other function
+    /// Used in GL.FramebufferRenderbuffer, GL.FramebufferTexture2D
     /// </summary>
     public enum FramebufferSlot : int
     {
@@ -12055,7 +12055,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.GetBoolean, GL.GetFloat and 1 other function
+    /// Used in GL.Apple.GetInteger64, GL.GetBoolean and 2 other functions
     /// </summary>
     public enum GetPName : int
     {
@@ -13857,21 +13857,21 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Ext.GetQueryObject
     /// </summary>
     public enum GetQueryObjectParam : int
     {
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Ext.GetQuery
     /// </summary>
     public enum GetQueryParam : int
     {
     }
 
     /// <summary>
-    /// Used in GL.GetTexParameter
+    /// Not used directly.
     /// </summary>
     public enum GetTextureParameter : int
     {
@@ -17516,7 +17516,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.CompressedTexSubImage2D, GL.ReadPixels and 2 other functions
+    /// Used in GL.CompressedTexSubImage2D, GL.ReadPixels and 3 other functions
     /// </summary>
     public enum PixelFormat : int
     {
@@ -17599,7 +17599,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.CompressedTexImage2D, GL.CopyTexImage2D and 1 other function
+    /// Not used directly.
     /// </summary>
     public enum PixelInternalFormat : int
     {
@@ -18123,7 +18123,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.ReadPixels, GL.TexImage2D and 1 other function
+    /// Used in GL.ReadPixels, GL.TexImage2D and 2 other functions
     /// </summary>
     public enum PixelType : int
     {
@@ -18442,7 +18442,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Ext.ProgramParameter
     /// </summary>
     public enum ProgramParameterName : int
     {
@@ -18749,7 +18749,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.Ext.BeginQuery, GL.Ext.EndQuery and 1 other function
     /// </summary>
     public enum QueryTarget : int
     {
@@ -18811,7 +18811,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.RenderbufferStorage
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 4 other functions
     /// </summary>
     public enum RenderbufferInternalFormat : int
     {
@@ -18881,7 +18881,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BindRenderbuffer, GL.FramebufferRenderbuffer and 2 other functions
+    /// Used in GL.Angle.RenderbufferStorageMultisample, GL.Apple.RenderbufferStorageMultisample and 7 other functions
     /// </summary>
     public enum RenderbufferTarget : int
     {
@@ -19649,7 +19649,7 @@ namespace OpenTK.Graphics.ES20
     }
 
     /// <summary>
-    /// Used in GL.BindTexture, GL.CompressedTexImage2D and 9 other functions
+    /// Used in GL.BindTexture, GL.GenerateMipmap and 2 other functions
     /// </summary>
     public enum TextureTarget : int
     {