From eb84a29206c28b985aa1defde76d96642d8ec6a4 Mon Sep 17 00:00:00 2001
From: "Stefanos A." <stapostol@gmail.com>
Date: Wed, 23 Oct 2013 20:12:05 +0200
Subject: [PATCH] Implemented "Debug Output" and "State and State Requests"
 functionality according to the OpenGL 4.4 specification, sections 20 and 22.

---
 .../Bind/Specifications/GL2/gloverrides.xml   | 228 ++++++-
 Source/OpenTK/Graphics/OpenGL/GL.cs           | 104 +--
 Source/OpenTK/Graphics/OpenGL/GLCore.cs       |  16 +-
 Source/OpenTK/Graphics/OpenGL/GLDelegates.cs  |  16 +-
 Source/OpenTK/Graphics/OpenGL/GLEnums.cs      | 592 +++++++++++++++++-
 5 files changed, 879 insertions(+), 77 deletions(-)

diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml
index 7264e380..87b9ca49 100644
--- a/Source/Bind/Specifications/GL2/gloverrides.xml
+++ b/Source/Bind/Specifications/GL2/gloverrides.xml
@@ -14,6 +14,12 @@
         <type>ArrayCap</type>
       </param>
     </function>
+    
+    <function name="GetString" extension="Core">
+      <param name="name">
+        <type>StringName</type>
+      </param>
+    </function>
 
     <function name="TexImage1D" extension="Core">
       <param name="internalformat">
@@ -438,9 +444,9 @@
       </param>
     </function>
 
-    <function name="GetString" extension="Core">
+    <function name="GetStringi" extension="Core">
       <param name="name">
-        <type>StringName</type>
+        <type>StringNameIndexed</type>
       </param>
     </function>
 
@@ -993,6 +999,30 @@
       </param>
     </function>
     
+    <function name="DebugMessageControl" extension="Core">
+      <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" extension="Core">
+      <param name="source">
+        <type>DebugSourceExternal</type>
+      </param>
+      <param name="type">
+        <type>DebugType</type>
+      </param>
+      <param name="severity">
+        <type>DebugSeverity</type>
+      </param>
+    </function>
+    
     <function name="FramebufferParameter" extension="Core">
       <param name="target">
         <type>FramebufferTarget</type>
@@ -1010,6 +1040,36 @@
         <type>FramebufferDefaultParameter</type>
       </param>
     </function>
+    
+    <function name="GetInternalformat" extension="Core">
+      <param name="target">
+        <type>ImageTarget</type>
+      </param>
+      <param name="internalformat">
+        <type>All</type>
+      </param>
+      <param name="pname">
+        <type>InternalFormatParameter</type>
+      </param>
+    </function>
+    
+    <function name="GetMessageDebugLog" extension="Core">
+      <param name="sources">
+        <type>DebugSource</type>
+      </param>
+      <param name="types">
+        <type>DebugType</type>
+      </param>
+      <param name="severities">
+        <type>DebugSeverity</type>
+      </param>
+    </function>
+    
+    <function name="GetObjectLabel" extension="Core">
+      <param name="identifier">
+        <type>ObjectLabelIdentifier</type>
+      </param>
+    </function>
         
     <function name="GetProgramInterfaceiv" extension="Core">
       <param name="programInterface">
@@ -1077,6 +1137,18 @@
       </param>
     </function>
     
+    <function name="ObjectLabel" extension="Core">
+      <param name="identifier">
+        <type>ObjectLabelIdentifier</type>
+      </param>
+    </function>
+    
+    <function name="PushDebugGroup" extension="Core">
+      <param name="source">
+        <type>DebugSourceExternal</type>
+      </param>
+    </function>
+    
     <function name="TexBufferRange" extension="Core">
       <param name="target">
         <type>TextureBufferTarget</type>
@@ -2020,6 +2092,63 @@
       <token name="CONVOLUTION_2D" value="0x8011" />
       <token name="SEPARABLE_2D" value="0x8012" />
     </enum>
+    <enum name="DebugSeverity">
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_HIGH" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_MEDIUM" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_LOW" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_NOTIFICATION" />
+    </enum>
+    <enum name="DebugSeverityControl">
+      <use enum="VERSION_1_1" token="DONT_CARE" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_HIGH" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_MEDIUM" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_LOW" />
+      <use enum="VERSION_4_3" token="DEBUG_SEVERITY_NOTIFICATION" />
+    </enum>
+    <enum name="DebugSource">
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_API" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_SHADER_COMPILER" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_WINDOW_SYSTEM" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_APPLICATION" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_OTHER" />
+    </enum>
+    <enum name="DebugSourceControl">
+      <use enum="VERSION_1_1" token="DONT_CARE" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_API" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_SHADER_COMPILER" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_WINDOW_SYSTEM" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_APPLICATION" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_OTHER" />
+    </enum>
+    <enum name="DebugSourceExternal">
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_THIRD_PARTY" />
+      <use enum="VERSION_4_3" token="DEBUG_SOURCE_APPLICATION" />
+    </enum>
+    <enum name="DebugType">
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_ERROR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_MARKER" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_OTHER" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_DEPRECATED_BEHAVIOR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_UNDEFINED_BEHAVIOR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PERFORMANCE" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PORTABILITY" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PUSH_GROUP" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_POP_GROUP" />
+    </enum>
+    <enum name="DebugTypeControl">
+      <use enum="VERSION_1_1" token="DONT_CARE" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_ERROR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_MARKER" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_OTHER" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_DEPRECATED_BEHAVIOR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_UNDEFINED_BEHAVIOR" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PERFORMANCE" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PORTABILITY" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_PUSH_GROUP" />
+      <use enum="VERSION_4_3" token="DEBUG_TYPE_POP_GROUP" />
+    </enum>
     <enum name="DrawBufferMode">
       <use enum="ARB_framebuffer_object" token="COLOR_ATTACHMENT0" />
       <use enum="ARB_framebuffer_object" token="COLOR_ATTACHMENT1" />
@@ -2108,6 +2237,8 @@
       <use enum="VERSION_3_1" token="TEXTURE_RECTANGLE" />
       <use enum="VERSION_3_2" token="TEXTURE_CUBE_MAP_SEAMLESS" />
       <use enum="VERSION_4_0" token="SAMPLE_SHADING" />
+      <use enum="VERSION_4_3" token="DEBUG_OUTPUT" />
+      <use enum="VERSION_4_3" token="DEBUG_OUTPUT_SYNCHRONOUS" />
       <use enum="VERSION_4_3" token="PRIMITIVE_RESTART_FIXED_INDEX" />
     </enum>
     <enum name="ErrorCode">
@@ -2618,6 +2749,79 @@
       <use enum="GetPName" token="BLEND" />
       <use enum="VERSION_4_1" token="SCISSOR_TEST" />
     </enum>
+    <enum name="InternalFormatParameter">
+      <use token="CLEAR_BUFFER" />
+      <use enum="VERSION_4_4" token="CLEAR_TEXTURE" />
+      <use token="COLOR_ENCODING" />
+      <use token="COLOR_COMPONENTS" />
+      <use token="COLOR_RENDERABLE" />
+      <use token="COMPUTE_TEXTURE" />
+      <use token="DEPTH_COMPONENTS" />
+      <use token="DEPTH_RENDERABLE" />
+      <use token="FILTER" />
+      <use token="FRAMEBUFFER_BLEND" />
+      <use token="FRAMEBUFFER_RENDERABLE" />
+      <use token="FRAMEBUFFER_RENDERABLE_LAYERED" />
+      <use token="FRAGMENT_TEXTURE" />
+      <use token="GEOMETRY_TEXTURE" />
+      <use token="MANUAL_GENERATE_MIPMAP" />
+      <use token="MIPMAP" />
+      <use token="IMAGE_COMPATIBILITY_CLASS" />
+      <use token="IMAGE_PIXEL_FORMAT" />
+      <use token="IMAGE_PIXEL_TYPE" />
+      <use token="IMAGE_FORMAT_COMPATIBILITY_TYPE" />
+      <use token="IMAGE_TEXEL_SIZE" />
+      <use token="INTERNALFORMAT_PREFERRED" />
+      <use token="INTERNALFORMAT_SUPPORTED" />
+      <use token="INTERNALFORMAT_RED_SIZE" />
+      <use token="INTERNALFORMAT_GREEN_SIZE" />
+      <use token="INTERNALFORMAT_BLUE_SIZE" />
+      <use token="INTERNALFORMAT_DEPTH_SIZE" />
+      <use token="INTERNALFORMAT_STENCIL_SIZE" />
+      <use token="INTERNALFORMAT_ALPHA_SIZE" />
+      <use token="INTERNALFORMAT_SHARED_SIZE" />
+      <use token="INTERNALFORMAT_RED_TYPE" />
+      <use token="INTERNALFORMAT_GREEN_TYPE" />
+      <use token="INTERNALFORMAT_BLUE_TYPE" />
+      <use token="INTERNALFORMAT_ALPHA_TYPE" />
+      <use token="INTERNALFORMAT_DEPTH_TYPE" />
+      <use token="INTERNALFORMAT_STENCIL_TYPE" />
+      <use token="MAX_COMBINED_DIMENSIONS" />
+      <use token="MAX_WIDTH" />
+      <use token="MAX_HEIGHT" />
+      <use token="MAX_DEPTH" />
+      <use token="MAX_LAYERS" />
+      <use token="NUM_SAMPLE_COUNTS" />
+      <use token="READ_PIXELS_FORMAT" />
+      <use token="READ_PIXELS_TYPE" />
+      <use token="SAMPLES" />
+      <use token="SHADER_IMAGE_ATOMIC" />
+      <use token="SHADER_IMAGE_LOAD" />
+      <use token="SHADER_IMAGE_STORE" />
+      <use token="SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST" />
+      <use token="SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST" />
+      <use token="SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE" />
+      <use token="SRGB_READ" />
+      <use token="SRGB_WRITE" />
+      <use token="STENCIL_COMPONENTS" />
+      <use token="STENCIL_RENDERABLE" />
+      <use token="TESS_CONTROL_TEXTURE" />
+      <use token="TESS_EVALUATION_TEXTURE" />
+      <use token="TEXTURE_COMPRESSED" />
+      <use token="TEXTURE_COMPRESSED_BLOCK_HEIGHT" />
+      <use token="TEXTURE_COMPRESSED_BLOCK_WIDTH" />
+      <use token="TEXTURE_COMPRESSED_BLOCK_SIZE" />
+      <use token="TEXTURE_GATHER" />
+      <use token="TEXTURE_GATHER_SHADOW" />
+      <use token="TEXTURE_IMAGE_FORMAT" />
+      <use token="GET_TEXTURE_IMAGE_FORMAT" />
+      <use token="TEXTURE_IMAGE_TYPE" />
+      <use token="GET_TEXTURE_IMAGE_TYPE" />
+      <use token="TEXTURE_SHADOW" />
+      <use token="TEXTURE_VIEW" />
+      <use token="VERTEX_TEXTURE" />
+      <use token="VIEW_COMPATIBILITY_CLASS" />
+    </enum>
     <enum name="LightModelColorControl">
       <token name="SEPARATE_SPECULAR_COLOR" value="0x81FA" />
       <token name="SINGLE_COLOR" value="0x81F9" />
@@ -2692,6 +2896,19 @@
       <use enum="VERSION_3_3" token="UNSIGNED_INT_2_10_10_10_REV" />
       <use enum="VERSION_3_3" token="INT_2_10_10_10_REV" />
     </enum>
+    <enum name="ObjectLabelIdentifier">
+      <use enum="VERSION_4_3" token="BUFFER" />
+      <use enum="VERSION_4_3" token="FRAMEBUFFER" />
+      <use enum="VERSION_4_3" token="RENDERBUFFER" />
+      <use enum="VERSION_4_3" token="PROGRAM_PIPELINE" />
+      <use enum="VERSION_4_3" token="PROGRAM" />
+      <use enum="VERSION_4_3" token="QUERY" />
+      <use enum="VERSION_4_3" token="SAMPLER" />
+      <use enum="VERSION_4_3" token="SHADER" />
+      <use enum="VERSION_4_3" token="TEXTURE" />
+      <use enum="VERSION_4_3" token="TRANSFORM_FEEDBACK" />
+      <use enum="VERSION_4_3" token="VERTEX_ARRAY" />
+    </enum>
     <enum name="PackedPointerType">
       <use enum="VERSION_3_3" token="UNSIGNED_INT_2_10_10_10_REV" />
       <use enum="VERSION_3_3" token="INT_2_10_10_10_REV" />
@@ -3263,8 +3480,11 @@
       <token name="INCR_WRAP" value="0x8507" />
     </enum>
     <enum name="StringName">
-      <use enum="StringName" token="EXTENSIONS" />
-      <token name="SHADING_LANGUAGE_VERSION" value="0x8B8C" />
+      <use enum="VERSION_2_0" token="SHADING_LANGUAGE_VERSION" />
+    </enum>
+    <enum name="StringNameIndexed">
+      <use enum="VERSION_1_1" token="EXTENSIONS" />
+      <use enum="VERSION_2_0" token="SHADING_LANGUAGE_VERSION" />
     </enum>
     <enum name="SyncCondition">
       <use enum="VERSION_4_1" token="SYNC_GPU_COMMANDS_COMPLETE" />
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 3409e2c4..54b8abc1 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -42622,7 +42622,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, Int32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, Int32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42632,7 +42632,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -42643,7 +42643,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, ref Int32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, ref Int32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42653,7 +42653,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -42665,13 +42665,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, Int32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, Int32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -42681,7 +42681,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, UInt32[] ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, UInt32[] ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42691,7 +42691,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (UInt32* ids_ptr = ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -42703,7 +42703,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, ref UInt32 ids, bool enabled)
+        void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, ref UInt32 ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42713,7 +42713,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (UInt32* ids_ptr = &ids)
                 {
-                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
+                    Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids_ptr, (bool)enabled);
                 }
             }
             #if DEBUG
@@ -42725,13 +42725,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageControl")]
         public static 
-        unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, UInt32* ids, bool enabled)
+        unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
+            Delegates.glDebugMessageControl((OpenTK.Graphics.OpenGL.DebugSourceControl)source, (OpenTK.Graphics.OpenGL.DebugTypeControl)type, (OpenTK.Graphics.OpenGL.DebugSeverityControl)severity, (Int32)count, (UInt32*)ids, (bool)enabled);
             #if DEBUG
             }
             #endif
@@ -42740,13 +42740,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, Int32 id, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.OpenGL.DebugSourceExternal source, OpenTK.Graphics.OpenGL.DebugType type, Int32 id, OpenTK.Graphics.OpenGL.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (UInt32)id, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.OpenGL.DebugSourceExternal)source, (OpenTK.Graphics.OpenGL.DebugType)type, (UInt32)id, (OpenTK.Graphics.OpenGL.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -42756,13 +42756,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glDebugMessageInsert")]
         public static 
-        void DebugMessageInsert(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, UInt32 id, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 length, String buf)
+        void DebugMessageInsert(OpenTK.Graphics.OpenGL.DebugSourceExternal source, OpenTK.Graphics.OpenGL.DebugType type, UInt32 id, OpenTK.Graphics.OpenGL.DebugSeverity severity, Int32 length, String buf)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDebugMessageInsert((OpenTK.Graphics.OpenGL.KhrDebug)source, (OpenTK.Graphics.OpenGL.KhrDebug)type, (UInt32)id, (OpenTK.Graphics.OpenGL.KhrDebug)severity, (Int32)length, (String)buf);
+            Delegates.glDebugMessageInsert((OpenTK.Graphics.OpenGL.DebugSourceExternal)source, (OpenTK.Graphics.OpenGL.DebugType)type, (UInt32)id, (OpenTK.Graphics.OpenGL.DebugSeverity)severity, (Int32)length, (String)buf);
             #if DEBUG
             }
             #endif
@@ -58948,7 +58948,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_internalformat_query2]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 pname, Int32 bufSize, [OutAttribute] Int64[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58958,7 +58958,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int64* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -58969,7 +58969,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_internalformat_query2]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query2", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 pname, Int32 bufSize, [OutAttribute] out Int64 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int64 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58979,7 +58979,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int64* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)pname, (Int32)bufSize, (Int64*)@params_ptr);
+                    Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -58992,13 +58992,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query2", Version = "4.3", EntryPoint = "glGetInternalformati64v")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 pname, Int32 bufSize, [OutAttribute] Int64* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery2)pname, (Int32)bufSize, (Int64*)@params);
+            Delegates.glGetInternalformati64v((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int64*)@params);
             #if DEBUG
             }
             #endif
@@ -59007,7 +59007,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.2 and ARB_internalformat_query]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery pname, Int32 bufSize, [OutAttribute] Int32[] @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -59017,7 +59017,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = @params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ArbInternalformatQuery)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -59028,7 +59028,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.2 and ARB_internalformat_query]</summary>
         [AutoGenerated(Category = "ARB_internalformat_query", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery pname, Int32 bufSize, [OutAttribute] out Int32 @params)
+        void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -59038,7 +59038,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* @params_ptr = &@params)
                 {
-                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ArbInternalformatQuery)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)pname, (Int32)bufSize, (Int32*)@params_ptr);
+                    Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params_ptr);
                     @params = *@params_ptr;
                 }
             }
@@ -59051,13 +59051,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_internalformat_query", Version = "4.2", EntryPoint = "glGetInternalformativ")]
         public static 
-        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ArbInternalformatQuery target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery pname, Int32 bufSize, [OutAttribute] Int32* @params)
+        unsafe void GetInternalformat(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ArbInternalformatQuery)target, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)internalformat, (OpenTK.Graphics.OpenGL.ArbInternalformatQuery)pname, (Int32)bufSize, (Int32*)@params);
+            Delegates.glGetInternalformativ((OpenTK.Graphics.OpenGL.ImageTarget)target, (OpenTK.Graphics.OpenGL.All)internalformat, (OpenTK.Graphics.OpenGL.InternalFormatParameter)pname, (Int32)bufSize, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -60563,7 +60563,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -60573,7 +60573,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                 }
             }
             #if DEBUG
@@ -60584,7 +60584,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -60594,7 +60594,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     length = *length_ptr;
                 }
             }
@@ -60607,13 +60607,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+        unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, Int32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+            Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
             #if DEBUG
             }
             #endif
@@ -60623,7 +60623,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -60633,7 +60633,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                 }
             }
             #if DEBUG
@@ -60645,7 +60645,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
+        void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -60655,7 +60655,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
+                    Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length_ptr, (StringBuilder)label);
                     length = *length_ptr;
                 }
             }
@@ -60668,13 +60668,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glGetObjectLabel")]
         public static 
-        unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
+        unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
+            Delegates.glGetObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)bufSize, (Int32*)length, (StringBuilder)label);
             #if DEBUG
             }
             #endif
@@ -67757,13 +67757,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
         public static 
-        String GetString(OpenTK.Graphics.OpenGL.StringName name, Int32 index)
+        String GetString(OpenTK.Graphics.OpenGL.StringNameIndexed name, Int32 index)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringName)name, (UInt32)index)); }
+            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringNameIndexed)name, (UInt32)index)); }
             #if DEBUG
             }
             #endif
@@ -67786,13 +67786,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
         public static 
-        String GetString(OpenTK.Graphics.OpenGL.StringName name, UInt32 index)
+        String GetString(OpenTK.Graphics.OpenGL.StringNameIndexed name, UInt32 index)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringName)name, (UInt32)index)); }
+            unsafe { return new string((sbyte*)Delegates.glGetStringi((OpenTK.Graphics.OpenGL.StringNameIndexed)name, (UInt32)index)); }
             #if DEBUG
             }
             #endif
@@ -81634,13 +81634,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glObjectLabel")]
         public static 
-        void ObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, Int32 name, Int32 length, String label)
+        void ObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, Int32 name, Int32 length, String label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)length, (String)label);
+            Delegates.glObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
             #if DEBUG
             }
             #endif
@@ -81650,13 +81650,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glObjectLabel")]
         public static 
-        void ObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 length, String label)
+        void ObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glObjectLabel((OpenTK.Graphics.OpenGL.KhrDebug)identifier, (UInt32)name, (Int32)length, (String)label);
+            Delegates.glObjectLabel((OpenTK.Graphics.OpenGL.ObjectLabelIdentifier)identifier, (UInt32)name, (Int32)length, (String)label);
             #if DEBUG
             }
             #endif
@@ -89940,13 +89940,13 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and KHR_debug]</summary>
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glPushDebugGroup")]
         public static 
-        void PushDebugGroup(OpenTK.Graphics.OpenGL.KhrDebug source, Int32 id, Int32 length, String message)
+        void PushDebugGroup(OpenTK.Graphics.OpenGL.DebugSourceExternal source, Int32 id, Int32 length, String message)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glPushDebugGroup((OpenTK.Graphics.OpenGL.KhrDebug)source, (UInt32)id, (Int32)length, (String)message);
+            Delegates.glPushDebugGroup((OpenTK.Graphics.OpenGL.DebugSourceExternal)source, (UInt32)id, (Int32)length, (String)message);
             #if DEBUG
             }
             #endif
@@ -89956,13 +89956,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "KHR_debug", Version = "4.3", EntryPoint = "glPushDebugGroup")]
         public static 
-        void PushDebugGroup(OpenTK.Graphics.OpenGL.KhrDebug source, UInt32 id, Int32 length, String message)
+        void PushDebugGroup(OpenTK.Graphics.OpenGL.DebugSourceExternal source, UInt32 id, Int32 length, String message)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glPushDebugGroup((OpenTK.Graphics.OpenGL.KhrDebug)source, (UInt32)id, (Int32)length, (String)message);
+            Delegates.glPushDebugGroup((OpenTK.Graphics.OpenGL.DebugSourceExternal)source, (UInt32)id, (Int32)length, (String)message);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index 44051efd..bc56e90c 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -1040,7 +1040,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void DebugMessageCallbackARB(DebugProcArb callback, IntPtr userParam);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControl", ExactSpelling = true)]
-            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, UInt32* ids, bool enabled);
+            internal extern static unsafe void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageControlARB", ExactSpelling = true)]
             internal extern static unsafe void DebugMessageControlARB(OpenTK.Graphics.OpenGL.ArbDebugOutput source, OpenTK.Graphics.OpenGL.ArbDebugOutput type, OpenTK.Graphics.OpenGL.ArbDebugOutput severity, Int32 count, UInt32* ids, bool enabled);
@@ -1049,7 +1049,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void DebugMessageEnableAMD(OpenTK.Graphics.OpenGL.AmdDebugOutput category, OpenTK.Graphics.OpenGL.AmdDebugOutput 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.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, UInt32 id, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 length, String buf);
+            internal extern static void DebugMessageInsert(OpenTK.Graphics.OpenGL.DebugSourceExternal source, OpenTK.Graphics.OpenGL.DebugType type, UInt32 id, OpenTK.Graphics.OpenGL.DebugSeverity severity, Int32 length, String buf);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDebugMessageInsertAMD", ExactSpelling = true)]
             internal extern static void DebugMessageInsertAMD(OpenTK.Graphics.OpenGL.AmdDebugOutput category, OpenTK.Graphics.OpenGL.AmdDebugOutput severity, UInt32 id, Int32 length, String buf);
@@ -2159,10 +2159,10 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetIntegerv(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformati64v", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal extern static unsafe void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInternalformativ", ExactSpelling = true)]
-            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL.ArbInternalformatQuery target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal extern static unsafe void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetInvariantBooleanvEXT", ExactSpelling = true)]
             internal extern static unsafe void GetInvariantBooleanvEXT(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data);
@@ -2399,7 +2399,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void GetObjectBufferivATI(UInt32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] Int32* @params);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectLabel", ExactSpelling = true)]
-            internal extern static unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal extern static unsafe void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetObjectParameterfvARB", ExactSpelling = true)]
             internal extern static unsafe void GetObjectParameterfvARB(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single* @params);
@@ -2678,7 +2678,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetStringi", ExactSpelling = true)]
-            internal extern static IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
+            internal extern static IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringNameIndexed name, UInt32 index);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSubroutineIndex", ExactSpelling = true)]
             internal extern static Int32 GetSubroutineIndex(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
@@ -4154,7 +4154,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static unsafe void NormalStream3svATI(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glObjectLabel", ExactSpelling = true)]
-            internal extern static void ObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 length, String label);
+            internal extern static void ObjectLabel(OpenTK.Graphics.OpenGL.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);
@@ -4931,7 +4931,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void PushClientAttribDefaultEXT(OpenTK.Graphics.OpenGL.ClientAttribMask mask);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glPushDebugGroup", ExactSpelling = true)]
-            internal extern static void PushDebugGroup(OpenTK.Graphics.OpenGL.KhrDebug source, UInt32 id, Int32 length, String message);
+            internal extern static void PushDebugGroup(OpenTK.Graphics.OpenGL.DebugSourceExternal source, UInt32 id, Int32 length, String message);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glPushMatrix", ExactSpelling = true)]
             internal extern static void PushMatrix();
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index 0a1b4f31..7fa5b904 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -1038,7 +1038,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void DebugMessageCallbackARB(DebugProcArb callback, IntPtr userParam);
             internal static DebugMessageCallbackARB glDebugMessageCallbackARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 count, UInt32* ids, bool enabled);
+            internal unsafe delegate void DebugMessageControl(OpenTK.Graphics.OpenGL.DebugSourceControl source, OpenTK.Graphics.OpenGL.DebugTypeControl type, OpenTK.Graphics.OpenGL.DebugSeverityControl severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageControl glDebugMessageControl;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void DebugMessageControlARB(OpenTK.Graphics.OpenGL.ArbDebugOutput source, OpenTK.Graphics.OpenGL.ArbDebugOutput type, OpenTK.Graphics.OpenGL.ArbDebugOutput severity, Int32 count, UInt32* ids, bool enabled);
@@ -1047,7 +1047,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void DebugMessageEnableAMD(OpenTK.Graphics.OpenGL.AmdDebugOutput category, OpenTK.Graphics.OpenGL.AmdDebugOutput severity, Int32 count, UInt32* ids, bool enabled);
             internal unsafe static DebugMessageEnableAMD glDebugMessageEnableAMD;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void DebugMessageInsert(OpenTK.Graphics.OpenGL.KhrDebug source, OpenTK.Graphics.OpenGL.KhrDebug type, UInt32 id, OpenTK.Graphics.OpenGL.KhrDebug severity, Int32 length, String buf);
+            internal delegate void DebugMessageInsert(OpenTK.Graphics.OpenGL.DebugSourceExternal source, OpenTK.Graphics.OpenGL.DebugType type, UInt32 id, OpenTK.Graphics.OpenGL.DebugSeverity severity, Int32 length, String buf);
             internal static DebugMessageInsert glDebugMessageInsert;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DebugMessageInsertAMD(OpenTK.Graphics.OpenGL.AmdDebugOutput category, OpenTK.Graphics.OpenGL.AmdDebugOutput severity, UInt32 id, Int32 length, String buf);
@@ -2157,10 +2157,10 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetIntegerv(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* @params);
             internal unsafe static GetIntegerv glGetIntegerv;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery2 pname, Int32 bufSize, [OutAttribute] Int64* @params);
+            internal unsafe delegate void GetInternalformati64v(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int64* @params);
             internal unsafe static GetInternalformati64v glGetInternalformati64v;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL.ArbInternalformatQuery target, OpenTK.Graphics.OpenGL.ArbInternalformatQuery internalformat, OpenTK.Graphics.OpenGL.ArbInternalformatQuery pname, Int32 bufSize, [OutAttribute] Int32* @params);
+            internal unsafe delegate void GetInternalformativ(OpenTK.Graphics.OpenGL.ImageTarget target, OpenTK.Graphics.OpenGL.All internalformat, OpenTK.Graphics.OpenGL.InternalFormatParameter pname, Int32 bufSize, [OutAttribute] Int32* @params);
             internal unsafe static GetInternalformativ glGetInternalformativ;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetInvariantBooleanvEXT(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data);
@@ -2397,7 +2397,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void GetObjectBufferivATI(UInt32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] Int32* @params);
             internal unsafe static GetObjectBufferivATI glGetObjectBufferivATI;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
+            internal unsafe delegate void GetObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder label);
             internal unsafe static GetObjectLabel glGetObjectLabel;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetObjectParameterfvARB(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single* @params);
@@ -2676,7 +2676,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
             internal static GetString glGetString;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
+            internal delegate IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringNameIndexed name, UInt32 index);
             internal static GetStringi glGetStringi;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate Int32 GetSubroutineIndex(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
@@ -4152,7 +4152,7 @@ namespace OpenTK.Graphics.OpenGL
             internal unsafe delegate void NormalStream3svATI(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords);
             internal unsafe static NormalStream3svATI glNormalStream3svATI;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ObjectLabel(OpenTK.Graphics.OpenGL.KhrDebug identifier, UInt32 name, Int32 length, String label);
+            internal delegate void ObjectLabel(OpenTK.Graphics.OpenGL.ObjectLabelIdentifier identifier, UInt32 name, Int32 length, String label);
             internal static ObjectLabel glObjectLabel;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void ObjectPtrLabel(IntPtr ptr, Int32 length, String label);
@@ -4929,7 +4929,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void PushClientAttribDefaultEXT(OpenTK.Graphics.OpenGL.ClientAttribMask mask);
             internal static PushClientAttribDefaultEXT glPushClientAttribDefaultEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void PushDebugGroup(OpenTK.Graphics.OpenGL.KhrDebug source, UInt32 id, Int32 length, String message);
+            internal delegate void PushDebugGroup(OpenTK.Graphics.OpenGL.DebugSourceExternal source, UInt32 id, Int32 length, String message);
             internal static PushDebugGroup glPushDebugGroup;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void PushMatrix();
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index e908bb64..f10c610f 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -736,7 +736,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Ingr.BlendFuncSeparate, GL.Sgix.IglooInterface
+    /// Used in GL.GetInternalformat, GL.Ingr.BlendFuncSeparate, GL.Sgix.IglooInterface
     /// </summary>
     public enum All : int
     {
@@ -23167,7 +23167,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetInternalformat
+    /// Not used directly.
     /// </summary>
     public enum ArbInternalformatQuery : int
     {
@@ -23178,7 +23178,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.GetInternalformat
+    /// Not used directly.
     /// </summary>
     public enum ArbInternalformatQuery2 : int
     {
@@ -29912,6 +29912,227 @@ namespace OpenTK.Graphics.OpenGL
         DoubleExt = ((int)0x140A)        ,
     }
 
+    /// <summary>
+    /// Used in GL.DebugMessageInsert
+    /// </summary>
+    public enum DebugSeverity : int
+    {
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B
+        /// </summary>
+        DebugSeverityNotification = ((int)0x826B)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_HIGH = 0x9146
+        /// </summary>
+        DebugSeverityHigh = ((int)0x9146)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_MEDIUM = 0x9147
+        /// </summary>
+        DebugSeverityMedium = ((int)0x9147)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_LOW = 0x9148
+        /// </summary>
+        DebugSeverityLow = ((int)0x9148)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.DebugMessageControl
+    /// </summary>
+    public enum DebugSeverityControl : int
+    {
+        /// <summary>
+        /// Original was GL_DONT_CARE = 0x1100
+        /// </summary>
+        DontCare = ((int)0x1100)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B
+        /// </summary>
+        DebugSeverityNotification = ((int)0x826B)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_HIGH = 0x9146
+        /// </summary>
+        DebugSeverityHigh = ((int)0x9146)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_MEDIUM = 0x9147
+        /// </summary>
+        DebugSeverityMedium = ((int)0x9147)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SEVERITY_LOW = 0x9148
+        /// </summary>
+        DebugSeverityLow = ((int)0x9148)        ,
+    }
+
+    /// <summary>
+    /// Not used directly.
+    /// </summary>
+    public enum DebugSource : int
+    {
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_API = 0x8246
+        /// </summary>
+        DebugSourceApi = ((int)0x8246)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247
+        /// </summary>
+        DebugSourceWindowSystem = ((int)0x8247)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248
+        /// </summary>
+        DebugSourceShaderCompiler = ((int)0x8248)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249
+        /// </summary>
+        DebugSourceThirdParty = ((int)0x8249)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_APPLICATION = 0x824A
+        /// </summary>
+        DebugSourceApplication = ((int)0x824A)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_OTHER = 0x824B
+        /// </summary>
+        DebugSourceOther = ((int)0x824B)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.DebugMessageControl
+    /// </summary>
+    public enum DebugSourceControl : int
+    {
+        /// <summary>
+        /// Original was GL_DONT_CARE = 0x1100
+        /// </summary>
+        DontCare = ((int)0x1100)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_API = 0x8246
+        /// </summary>
+        DebugSourceApi = ((int)0x8246)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247
+        /// </summary>
+        DebugSourceWindowSystem = ((int)0x8247)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248
+        /// </summary>
+        DebugSourceShaderCompiler = ((int)0x8248)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249
+        /// </summary>
+        DebugSourceThirdParty = ((int)0x8249)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_APPLICATION = 0x824A
+        /// </summary>
+        DebugSourceApplication = ((int)0x824A)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_OTHER = 0x824B
+        /// </summary>
+        DebugSourceOther = ((int)0x824B)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.DebugMessageInsert, GL.PushDebugGroup
+    /// </summary>
+    public enum DebugSourceExternal : int
+    {
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249
+        /// </summary>
+        DebugSourceThirdParty = ((int)0x8249)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_SOURCE_APPLICATION = 0x824A
+        /// </summary>
+        DebugSourceApplication = ((int)0x824A)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.DebugMessageInsert
+    /// </summary>
+    public enum DebugType : int
+    {
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_ERROR = 0x824C
+        /// </summary>
+        DebugTypeError = ((int)0x824C)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D
+        /// </summary>
+        DebugTypeDeprecatedBehavior = ((int)0x824D)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E
+        /// </summary>
+        DebugTypeUndefinedBehavior = ((int)0x824E)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PORTABILITY = 0x824F
+        /// </summary>
+        DebugTypePortability = ((int)0x824F)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PERFORMANCE = 0x8250
+        /// </summary>
+        DebugTypePerformance = ((int)0x8250)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_OTHER = 0x8251
+        /// </summary>
+        DebugTypeOther = ((int)0x8251)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_MARKER = 0x8268
+        /// </summary>
+        DebugTypeMarker = ((int)0x8268)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PUSH_GROUP = 0x8269
+        /// </summary>
+        DebugTypePushGroup = ((int)0x8269)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_POP_GROUP = 0x826A
+        /// </summary>
+        DebugTypePopGroup = ((int)0x826A)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.DebugMessageControl
+    /// </summary>
+    public enum DebugTypeControl : int
+    {
+        /// <summary>
+        /// Original was GL_DONT_CARE = 0x1100
+        /// </summary>
+        DontCare = ((int)0x1100)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_ERROR = 0x824C
+        /// </summary>
+        DebugTypeError = ((int)0x824C)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D
+        /// </summary>
+        DebugTypeDeprecatedBehavior = ((int)0x824D)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E
+        /// </summary>
+        DebugTypeUndefinedBehavior = ((int)0x824E)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PORTABILITY = 0x824F
+        /// </summary>
+        DebugTypePortability = ((int)0x824F)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PERFORMANCE = 0x8250
+        /// </summary>
+        DebugTypePerformance = ((int)0x8250)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_OTHER = 0x8251
+        /// </summary>
+        DebugTypeOther = ((int)0x8251)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_MARKER = 0x8268
+        /// </summary>
+        DebugTypeMarker = ((int)0x8268)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_PUSH_GROUP = 0x8269
+        /// </summary>
+        DebugTypePushGroup = ((int)0x8269)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_TYPE_POP_GROUP = 0x826A
+        /// </summary>
+        DebugTypePopGroup = ((int)0x826A)        ,
+    }
+
     /// <summary>
     /// Used in GL.DepthFunc, GL.NV.PathCoverDepthFunc
     /// </summary>
@@ -30665,6 +30886,10 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         SharedTexturePaletteExt = ((int)0x81FB)        ,
         /// <summary>
+        /// Original was GL_DEBUG_OUTPUT_SYNCHRONOUS = 0x8242
+        /// </summary>
+        DebugOutputSynchronous = ((int)0x8242)        ,
+        /// <summary>
         /// Original was GL_ASYNC_HISTOGRAM_SGIX = 0x832C
         /// </summary>
         AsyncHistogramSgix = ((int)0x832C)        ,
@@ -30792,6 +31017,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_PRIMITIVE_RESTART = 0x8F9D
         /// </summary>
         PrimitiveRestart = ((int)0x8F9D)        ,
+        /// <summary>
+        /// Original was GL_DEBUG_OUTPUT = 0x92E0
+        /// </summary>
+        DebugOutput = ((int)0x92E0)        ,
     }
 
     /// <summary>
@@ -39764,7 +39993,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.CopyImageSubData
+    /// Used in GL.CopyImageSubData, GL.GetInternalformat
     /// </summary>
     public enum ImageTarget : int
     {
@@ -40152,7 +40381,294 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.DebugMessageControl, GL.DebugMessageInsert, GL.GetDebugMessageLog, GL.GetObjectLabel, GL.ObjectLabel, GL.PushDebugGroup
+    /// Used in GL.GetInternalformat
+    /// </summary>
+    public enum InternalFormatParameter : int
+    {
+        /// <summary>
+        /// Original was GL_SAMPLES = 0x80A9
+        /// </summary>
+        Samples = ((int)0x80A9)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_SUPPORTED = 0x826F
+        /// </summary>
+        InternalformatSupported = ((int)0x826F)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_PREFERRED = 0x8270
+        /// </summary>
+        InternalformatPreferred = ((int)0x8270)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_RED_SIZE = 0x8271
+        /// </summary>
+        InternalformatRedSize = ((int)0x8271)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_GREEN_SIZE = 0x8272
+        /// </summary>
+        InternalformatGreenSize = ((int)0x8272)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_BLUE_SIZE = 0x8273
+        /// </summary>
+        InternalformatBlueSize = ((int)0x8273)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_ALPHA_SIZE = 0x8274
+        /// </summary>
+        InternalformatAlphaSize = ((int)0x8274)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_DEPTH_SIZE = 0x8275
+        /// </summary>
+        InternalformatDepthSize = ((int)0x8275)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_STENCIL_SIZE = 0x8276
+        /// </summary>
+        InternalformatStencilSize = ((int)0x8276)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_SHARED_SIZE = 0x8277
+        /// </summary>
+        InternalformatSharedSize = ((int)0x8277)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_RED_TYPE = 0x8278
+        /// </summary>
+        InternalformatRedType = ((int)0x8278)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_GREEN_TYPE = 0x8279
+        /// </summary>
+        InternalformatGreenType = ((int)0x8279)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_BLUE_TYPE = 0x827A
+        /// </summary>
+        InternalformatBlueType = ((int)0x827A)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_ALPHA_TYPE = 0x827B
+        /// </summary>
+        InternalformatAlphaType = ((int)0x827B)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_DEPTH_TYPE = 0x827C
+        /// </summary>
+        InternalformatDepthType = ((int)0x827C)        ,
+        /// <summary>
+        /// Original was GL_INTERNALFORMAT_STENCIL_TYPE = 0x827D
+        /// </summary>
+        InternalformatStencilType = ((int)0x827D)        ,
+        /// <summary>
+        /// Original was GL_MAX_WIDTH = 0x827E
+        /// </summary>
+        MaxWidth = ((int)0x827E)        ,
+        /// <summary>
+        /// Original was GL_MAX_HEIGHT = 0x827F
+        /// </summary>
+        MaxHeight = ((int)0x827F)        ,
+        /// <summary>
+        /// Original was GL_MAX_DEPTH = 0x8280
+        /// </summary>
+        MaxDepth = ((int)0x8280)        ,
+        /// <summary>
+        /// Original was GL_MAX_LAYERS = 0x8281
+        /// </summary>
+        MaxLayers = ((int)0x8281)        ,
+        /// <summary>
+        /// Original was GL_MAX_COMBINED_DIMENSIONS = 0x8282
+        /// </summary>
+        MaxCombinedDimensions = ((int)0x8282)        ,
+        /// <summary>
+        /// Original was GL_COLOR_COMPONENTS = 0x8283
+        /// </summary>
+        ColorComponents = ((int)0x8283)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_COMPONENTS = 0x8284
+        /// </summary>
+        DepthComponents = ((int)0x8284)        ,
+        /// <summary>
+        /// Original was GL_STENCIL_COMPONENTS = 0x8285
+        /// </summary>
+        StencilComponents = ((int)0x8285)        ,
+        /// <summary>
+        /// Original was GL_COLOR_RENDERABLE = 0x8286
+        /// </summary>
+        ColorRenderable = ((int)0x8286)        ,
+        /// <summary>
+        /// Original was GL_DEPTH_RENDERABLE = 0x8287
+        /// </summary>
+        DepthRenderable = ((int)0x8287)        ,
+        /// <summary>
+        /// Original was GL_STENCIL_RENDERABLE = 0x8288
+        /// </summary>
+        StencilRenderable = ((int)0x8288)        ,
+        /// <summary>
+        /// Original was GL_FRAMEBUFFER_RENDERABLE = 0x8289
+        /// </summary>
+        FramebufferRenderable = ((int)0x8289)        ,
+        /// <summary>
+        /// Original was GL_FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A
+        /// </summary>
+        FramebufferRenderableLayered = ((int)0x828A)        ,
+        /// <summary>
+        /// Original was GL_FRAMEBUFFER_BLEND = 0x828B
+        /// </summary>
+        FramebufferBlend = ((int)0x828B)        ,
+        /// <summary>
+        /// Original was GL_READ_PIXELS_FORMAT = 0x828D
+        /// </summary>
+        ReadPixelsFormat = ((int)0x828D)        ,
+        /// <summary>
+        /// Original was GL_READ_PIXELS_TYPE = 0x828E
+        /// </summary>
+        ReadPixelsType = ((int)0x828E)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_IMAGE_FORMAT = 0x828F
+        /// </summary>
+        TextureImageFormat = ((int)0x828F)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_IMAGE_TYPE = 0x8290
+        /// </summary>
+        TextureImageType = ((int)0x8290)        ,
+        /// <summary>
+        /// Original was GL_GET_TEXTURE_IMAGE_FORMAT = 0x8291
+        /// </summary>
+        GetTextureImageFormat = ((int)0x8291)        ,
+        /// <summary>
+        /// Original was GL_GET_TEXTURE_IMAGE_TYPE = 0x8292
+        /// </summary>
+        GetTextureImageType = ((int)0x8292)        ,
+        /// <summary>
+        /// Original was GL_MIPMAP = 0x8293
+        /// </summary>
+        Mipmap = ((int)0x8293)        ,
+        /// <summary>
+        /// Original was GL_MANUAL_GENERATE_MIPMAP = 0x8294
+        /// </summary>
+        ManualGenerateMipmap = ((int)0x8294)        ,
+        /// <summary>
+        /// Original was GL_COLOR_ENCODING = 0x8296
+        /// </summary>
+        ColorEncoding = ((int)0x8296)        ,
+        /// <summary>
+        /// Original was GL_SRGB_READ = 0x8297
+        /// </summary>
+        SrgbRead = ((int)0x8297)        ,
+        /// <summary>
+        /// Original was GL_SRGB_WRITE = 0x8298
+        /// </summary>
+        SrgbWrite = ((int)0x8298)        ,
+        /// <summary>
+        /// Original was GL_FILTER = 0x829A
+        /// </summary>
+        Filter = ((int)0x829A)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_TEXTURE = 0x829B
+        /// </summary>
+        VertexTexture = ((int)0x829B)        ,
+        /// <summary>
+        /// Original was GL_TESS_CONTROL_TEXTURE = 0x829C
+        /// </summary>
+        TessControlTexture = ((int)0x829C)        ,
+        /// <summary>
+        /// Original was GL_TESS_EVALUATION_TEXTURE = 0x829D
+        /// </summary>
+        TessEvaluationTexture = ((int)0x829D)        ,
+        /// <summary>
+        /// Original was GL_GEOMETRY_TEXTURE = 0x829E
+        /// </summary>
+        GeometryTexture = ((int)0x829E)        ,
+        /// <summary>
+        /// Original was GL_FRAGMENT_TEXTURE = 0x829F
+        /// </summary>
+        FragmentTexture = ((int)0x829F)        ,
+        /// <summary>
+        /// Original was GL_COMPUTE_TEXTURE = 0x82A0
+        /// </summary>
+        ComputeTexture = ((int)0x82A0)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_SHADOW = 0x82A1
+        /// </summary>
+        TextureShadow = ((int)0x82A1)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_GATHER = 0x82A2
+        /// </summary>
+        TextureGather = ((int)0x82A2)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_GATHER_SHADOW = 0x82A3
+        /// </summary>
+        TextureGatherShadow = ((int)0x82A3)        ,
+        /// <summary>
+        /// Original was GL_SHADER_IMAGE_LOAD = 0x82A4
+        /// </summary>
+        ShaderImageLoad = ((int)0x82A4)        ,
+        /// <summary>
+        /// Original was GL_SHADER_IMAGE_STORE = 0x82A5
+        /// </summary>
+        ShaderImageStore = ((int)0x82A5)        ,
+        /// <summary>
+        /// Original was GL_SHADER_IMAGE_ATOMIC = 0x82A6
+        /// </summary>
+        ShaderImageAtomic = ((int)0x82A6)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_TEXEL_SIZE = 0x82A7
+        /// </summary>
+        ImageTexelSize = ((int)0x82A7)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_COMPATIBILITY_CLASS = 0x82A8
+        /// </summary>
+        ImageCompatibilityClass = ((int)0x82A8)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_PIXEL_FORMAT = 0x82A9
+        /// </summary>
+        ImagePixelFormat = ((int)0x82A9)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_PIXEL_TYPE = 0x82AA
+        /// </summary>
+        ImagePixelType = ((int)0x82AA)        ,
+        /// <summary>
+        /// Original was GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC
+        /// </summary>
+        SimultaneousTextureAndDepthTest = ((int)0x82AC)        ,
+        /// <summary>
+        /// Original was GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD
+        /// </summary>
+        SimultaneousTextureAndStencilTest = ((int)0x82AD)        ,
+        /// <summary>
+        /// Original was GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF
+        /// </summary>
+        SimultaneousTextureAndStencilWrite = ((int)0x82AF)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1
+        /// </summary>
+        TextureCompressedBlockWidth = ((int)0x82B1)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2
+        /// </summary>
+        TextureCompressedBlockHeight = ((int)0x82B2)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3
+        /// </summary>
+        TextureCompressedBlockSize = ((int)0x82B3)        ,
+        /// <summary>
+        /// Original was GL_CLEAR_BUFFER = 0x82B4
+        /// </summary>
+        ClearBuffer = ((int)0x82B4)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_VIEW = 0x82B5
+        /// </summary>
+        TextureView = ((int)0x82B5)        ,
+        /// <summary>
+        /// Original was GL_VIEW_COMPATIBILITY_CLASS = 0x82B6
+        /// </summary>
+        ViewCompatibilityClass = ((int)0x82B6)        ,
+        /// <summary>
+        /// Original was GL_TEXTURE_COMPRESSED = 0x86A1
+        /// </summary>
+        TextureCompressed = ((int)0x86A1)        ,
+        /// <summary>
+        /// Original was GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7
+        /// </summary>
+        ImageFormatCompatibilityType = ((int)0x90C7)        ,
+        /// <summary>
+        /// Original was GL_NUM_SAMPLE_COUNTS = 0x9380
+        /// </summary>
+        NumSampleCounts = ((int)0x9380)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.GetDebugMessageLog
     /// </summary>
     public enum KhrDebug : int
     {
@@ -45551,6 +46067,57 @@ namespace OpenTK.Graphics.OpenGL
     {
     }
 
+    /// <summary>
+    /// Used in GL.GetObjectLabel, GL.ObjectLabel
+    /// </summary>
+    public enum ObjectLabelIdentifier : int
+    {
+        /// <summary>
+        /// Original was GL_TEXTURE = 0x1702
+        /// </summary>
+        Texture = ((int)0x1702)        ,
+        /// <summary>
+        /// Original was GL_VERTEX_ARRAY = 0x8074
+        /// </summary>
+        VertexArray = ((int)0x8074)        ,
+        /// <summary>
+        /// Original was GL_BUFFER = 0x82E0
+        /// </summary>
+        Buffer = ((int)0x82E0)        ,
+        /// <summary>
+        /// Original was GL_SHADER = 0x82E1
+        /// </summary>
+        Shader = ((int)0x82E1)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM = 0x82E2
+        /// </summary>
+        Program = ((int)0x82E2)        ,
+        /// <summary>
+        /// Original was GL_QUERY = 0x82E3
+        /// </summary>
+        Query = ((int)0x82E3)        ,
+        /// <summary>
+        /// Original was GL_PROGRAM_PIPELINE = 0x82E4
+        /// </summary>
+        ProgramPipeline = ((int)0x82E4)        ,
+        /// <summary>
+        /// Original was GL_SAMPLER = 0x82E6
+        /// </summary>
+        Sampler = ((int)0x82E6)        ,
+        /// <summary>
+        /// Original was GL_FRAMEBUFFER = 0x8D40
+        /// </summary>
+        Framebuffer = ((int)0x8D40)        ,
+        /// <summary>
+        /// Original was GL_RENDERBUFFER = 0x8D41
+        /// </summary>
+        Renderbuffer = ((int)0x8D41)        ,
+        /// <summary>
+        /// Original was GL_TRANSFORM_FEEDBACK = 0x8E22
+        /// </summary>
+        TransformFeedback = ((int)0x8E22)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>
@@ -51523,6 +52090,21 @@ namespace OpenTK.Graphics.OpenGL
         ShadingLanguageVersion = ((int)0x8B8C)        ,
     }
 
+    /// <summary>
+    /// Used in GL.GetString
+    /// </summary>
+    public enum StringNameIndexed : int
+    {
+        /// <summary>
+        /// Original was GL_EXTENSIONS = 0x1F03
+        /// </summary>
+        Extensions = ((int)0x1F03)        ,
+        /// <summary>
+        /// Original was GL_SHADING_LANGUAGE_VERSION = 0x8B8C
+        /// </summary>
+        ShadingLanguageVersion = ((int)0x8B8C)        ,
+    }
+
     /// <summary>
     /// Not used directly.
     /// </summary>