diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml
index 1b632275..19d2d4f4 100644
--- a/Source/Bind/Specifications/GL2/gloverrides.xml
+++ b/Source/Bind/Specifications/GL2/gloverrides.xml
@@ -431,6 +431,12 @@
         <type>ClearBuffer</type>
       </param>
     </function>
+    
+    <function name="ClearBufferfi" extension="Core">
+      <param name="buffer">
+        <type>ClearBufferCombined</type>
+      </param>
+    </function>
 
     <function name="GetString" extension="Core">
       <param name="name">
@@ -1038,6 +1044,24 @@
       </param>
     </function>
     
+    <function name="InvalidateFramebuffer" extension="Core">
+      <param name="target">
+        <type>FramebufferTarget</type>
+      </param>
+      <param name="attachments">
+        <type>FramebufferAttachment</type>
+      </param>
+    </function>
+    
+    <function name="InvalidateSubFramebuffer" extension="Core">
+      <param name="target">
+        <type>FramebufferTarget</type>
+      </param>
+      <param name="attachments">
+        <type>FramebufferAttachment</type>
+      </param>
+    </function>
+    
     <function name="MultiDrawArraysIndirect" extension="Core">
       <param name="mode">
         <type>PrimitiveType</type>
@@ -1942,6 +1966,8 @@
       <use enum="VERSION_1_1" token="COLOR" />
       <use enum="VERSION_1_1" token="DEPTH" />
       <use enum="VERSION_1_1" token="STENCIL" />
+    </enum>
+    <enum name="ClearBufferCombined">
       <use enum="VERSION_3_0" token="DEPTH_STENCIL" />
     </enum>
     <enum name="ColorPointerType">
@@ -2134,6 +2160,9 @@
       <use enum="VERSION_1_1" token="AUX1" />
       <use enum="VERSION_1_1" token="AUX2" />
       <use enum="VERSION_1_1" token="AUX3" />
+      <use enum="VERSION_1_1" token="COLOR" />
+      <use enum="VERSION_1_1" token="DEPTH" />
+      <use enum="VERSION_1_1" token="STENCIL" />
     </enum>
     <enum name="FramebufferAttachmentComponentType">
       <use enum="DataType" token="FLOAT" />
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 41157ff5..12c00289 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -34927,13 +34927,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glClearBufferfi")]
         public static 
-        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single depth, Int32 stencil)
+        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBufferCombined buffer, Int32 drawbuffer, Single depth, Int32 stencil)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glClearBufferfi((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (Single)depth, (Int32)stencil);
+            Delegates.glClearBufferfi((OpenTK.Graphics.OpenGL.ClearBufferCombined)buffer, (Int32)drawbuffer, (Single)depth, (Int32)stencil);
             #if DEBUG
             }
             #endif
@@ -73224,7 +73224,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_invalidate_subdata]</summary>
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateFramebuffer")]
         public static 
-        void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata[] attachments)
+        void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment[] attachments)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73232,9 +73232,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments_ptr = attachments)
+                fixed (OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments_ptr = attachments)
                 {
-                    Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments_ptr);
+                    Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments_ptr);
                 }
             }
             #if DEBUG
@@ -73245,7 +73245,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_invalidate_subdata]</summary>
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateFramebuffer")]
         public static 
-        void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, ref OpenTK.Graphics.OpenGL.ArbInvalidateSubdata attachments)
+        void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, ref OpenTK.Graphics.OpenGL.FramebufferAttachment attachments)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73253,9 +73253,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments_ptr = &attachments)
+                fixed (OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments_ptr = &attachments)
                 {
-                    Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments_ptr);
+                    Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments_ptr);
                 }
             }
             #if DEBUG
@@ -73267,13 +73267,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateFramebuffer")]
         public static 
-        unsafe void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments)
+        unsafe void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments);
+            Delegates.glInvalidateFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments);
             #if DEBUG
             }
             #endif
@@ -73282,7 +73282,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_invalidate_subdata]</summary>
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateSubFramebuffer")]
         public static 
-        void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata[] attachments, Int32 x, Int32 y, Int32 width, Int32 height)
+        void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment[] attachments, Int32 x, Int32 y, Int32 width, Int32 height)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73290,9 +73290,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments_ptr = attachments)
+                fixed (OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments_ptr = attachments)
                 {
-                    Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments_ptr, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
+                    Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments_ptr, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
                 }
             }
             #if DEBUG
@@ -73303,7 +73303,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <summary>[requires: v4.3 and ARB_invalidate_subdata]</summary>
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateSubFramebuffer")]
         public static 
-        void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, ref OpenTK.Graphics.OpenGL.ArbInvalidateSubdata attachments, Int32 x, Int32 y, Int32 width, Int32 height)
+        void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, ref OpenTK.Graphics.OpenGL.FramebufferAttachment attachments, Int32 x, Int32 y, Int32 width, Int32 height)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73311,9 +73311,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments_ptr = &attachments)
+                fixed (OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments_ptr = &attachments)
                 {
-                    Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments_ptr, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
+                    Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments_ptr, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
                 }
             }
             #if DEBUG
@@ -73325,13 +73325,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ARB_invalidate_subdata", Version = "4.3", EntryPoint = "glInvalidateSubFramebuffer")]
         public static 
-        unsafe void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments, Int32 x, Int32 y, Int32 width, Int32 height)
+        unsafe void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments, Int32 x, Int32 y, Int32 width, Int32 height)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.ArbInvalidateSubdata)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.ArbInvalidateSubdata*)attachments, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
+            Delegates.glInvalidateSubFramebuffer((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (Int32)numAttachments, (OpenTK.Graphics.OpenGL.FramebufferAttachment*)attachments, (Int32)x, (Int32)y, (Int32)width, (Int32)height);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
index 8a842897..ad39c37b 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs
@@ -446,7 +446,7 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void ClearBufferData(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.ArbClearBufferObject type, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClearBufferfi", ExactSpelling = true)]
-            internal extern static void ClearBufferfi(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single depth, Int32 stencil);
+            internal extern static void ClearBufferfi(OpenTK.Graphics.OpenGL.ClearBufferCombined buffer, Int32 drawbuffer, Single depth, Int32 stencil);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClearBufferfv", ExactSpelling = true)]
             internal extern static unsafe void ClearBufferfv(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single* value);
@@ -3086,10 +3086,10 @@ namespace OpenTK.Graphics.OpenGL
             internal extern static void InvalidateBufferSubData(UInt32 buffer, IntPtr offset, IntPtr length);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glInvalidateFramebuffer", ExactSpelling = true)]
-            internal extern static unsafe void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments);
+            internal extern static unsafe void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glInvalidateSubFramebuffer", ExactSpelling = true)]
-            internal extern static unsafe void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal extern static unsafe void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments, Int32 x, Int32 y, Int32 width, Int32 height);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glInvalidateTexImage", ExactSpelling = true)]
             internal extern static void InvalidateTexImage(UInt32 texture, Int32 level);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
index b37b6827..54d7642c 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
@@ -444,7 +444,7 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void ClearBufferData(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.ArbClearBufferObject type, IntPtr data);
             internal static ClearBufferData glClearBufferData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void ClearBufferfi(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single depth, Int32 stencil);
+            internal delegate void ClearBufferfi(OpenTK.Graphics.OpenGL.ClearBufferCombined buffer, Int32 drawbuffer, Single depth, Int32 stencil);
             internal static ClearBufferfi glClearBufferfi;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void ClearBufferfv(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single* value);
@@ -3084,10 +3084,10 @@ namespace OpenTK.Graphics.OpenGL
             internal delegate void InvalidateBufferSubData(UInt32 buffer, IntPtr offset, IntPtr length);
             internal static InvalidateBufferSubData glInvalidateBufferSubData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments);
+            internal unsafe delegate void InvalidateFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments);
             internal unsafe static InvalidateFramebuffer glInvalidateFramebuffer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.ArbInvalidateSubdata target, Int32 numAttachments, OpenTK.Graphics.OpenGL.ArbInvalidateSubdata* attachments, Int32 x, Int32 y, Int32 width, Int32 height);
+            internal unsafe delegate void InvalidateSubFramebuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, Int32 numAttachments, OpenTK.Graphics.OpenGL.FramebufferAttachment* attachments, Int32 x, Int32 y, Int32 width, Int32 height);
             internal unsafe static InvalidateSubFramebuffer glInvalidateSubFramebuffer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void InvalidateTexImage(UInt32 texture, Int32 level);
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index 8835edb1..d815229a 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -23649,7 +23649,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.InvalidateFramebuffer, GL.InvalidateSubFramebuffer
+    /// Not used directly.
     /// </summary>
     public enum ArbInvalidateSubdata : int
     {
@@ -29424,6 +29424,13 @@ namespace OpenTK.Graphics.OpenGL
         /// Original was GL_STENCIL = 0x1802
         /// </summary>
         Stencil = ((int)0x1802)        ,
+    }
+
+    /// <summary>
+    /// Used in GL.ClearBuffer
+    /// </summary>
+    public enum ClearBufferCombined : int
+    {
         /// <summary>
         /// Original was GL_DEPTH_STENCIL = 0x84F9
         /// </summary>
@@ -35423,7 +35430,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.FramebufferTexture, GL.Arb.FramebufferTextureFace, GL.Arb.FramebufferTextureLayer, GL.FramebufferRenderbuffer, GL.FramebufferTexture, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.FramebufferTextureLayer, GL.GetFramebufferAttachmentParameter, GL.Ext.FramebufferRenderbuffer, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTexture, GL.Ext.FramebufferTextureFace, GL.Ext.FramebufferTextureLayer, GL.Ext.GetFramebufferAttachmentParameter, GL.Ext.GetNamedFramebufferAttachmentParameter, GL.Ext.NamedFramebufferRenderbuffer, GL.Ext.NamedFramebufferTexture1D, GL.Ext.NamedFramebufferTexture2D, GL.Ext.NamedFramebufferTexture3D, GL.Ext.NamedFramebufferTexture, GL.Ext.NamedFramebufferTextureFace, GL.Ext.NamedFramebufferTextureLayer
+    /// Used in GL.Arb.FramebufferTexture, GL.Arb.FramebufferTextureFace, GL.Arb.FramebufferTextureLayer, GL.FramebufferRenderbuffer, GL.FramebufferTexture, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.FramebufferTextureLayer, GL.GetFramebufferAttachmentParameter, GL.InvalidateFramebuffer, GL.InvalidateSubFramebuffer, GL.Ext.FramebufferRenderbuffer, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTexture, GL.Ext.FramebufferTextureFace, GL.Ext.FramebufferTextureLayer, GL.Ext.GetFramebufferAttachmentParameter, GL.Ext.GetNamedFramebufferAttachmentParameter, GL.Ext.NamedFramebufferRenderbuffer, GL.Ext.NamedFramebufferTexture1D, GL.Ext.NamedFramebufferTexture2D, GL.Ext.NamedFramebufferTexture3D, GL.Ext.NamedFramebufferTexture, GL.Ext.NamedFramebufferTextureFace, GL.Ext.NamedFramebufferTextureLayer
     /// </summary>
     public enum FramebufferAttachment : int
     {
@@ -35460,6 +35467,18 @@ namespace OpenTK.Graphics.OpenGL
         /// </summary>
         Aux3 = ((int)0x040C)        ,
         /// <summary>
+        /// Original was GL_COLOR = 0x1800
+        /// </summary>
+        Color = ((int)0x1800)        ,
+        /// <summary>
+        /// Original was GL_DEPTH = 0x1801
+        /// </summary>
+        Depth = ((int)0x1801)        ,
+        /// <summary>
+        /// Original was GL_STENCIL = 0x1802
+        /// </summary>
+        Stencil = ((int)0x1802)        ,
+        /// <summary>
         /// Original was GL_DEPTH_STENCIL_ATTACHMENT = 0x821A
         /// </summary>
         DepthStencilAttachment = ((int)0x821A)        ,
@@ -35845,7 +35864,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.Arb.FramebufferTexture, GL.Arb.FramebufferTextureFace, GL.Arb.FramebufferTextureLayer, GL.BindFramebuffer, GL.CheckFramebufferStatus, GL.FramebufferParameter, GL.FramebufferRenderbuffer, GL.FramebufferTexture, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.FramebufferTextureLayer, GL.GetFramebufferAttachmentParameter, GL.GetFramebufferParameter, GL.Ext.BindFramebuffer, GL.Ext.CheckFramebufferStatus, GL.Ext.CheckNamedFramebufferStatus, GL.Ext.FramebufferRenderbuffer, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTexture, GL.Ext.FramebufferTextureFace, GL.Ext.FramebufferTextureLayer, GL.Ext.GetFramebufferAttachmentParameter
+    /// Used in GL.Arb.FramebufferTexture, GL.Arb.FramebufferTextureFace, GL.Arb.FramebufferTextureLayer, GL.BindFramebuffer, GL.CheckFramebufferStatus, GL.FramebufferParameter, GL.FramebufferRenderbuffer, GL.FramebufferTexture, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.FramebufferTextureLayer, GL.GetFramebufferAttachmentParameter, GL.GetFramebufferParameter, GL.InvalidateFramebuffer, GL.InvalidateSubFramebuffer, GL.Ext.BindFramebuffer, GL.Ext.CheckFramebufferStatus, GL.Ext.CheckNamedFramebufferStatus, GL.Ext.FramebufferRenderbuffer, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTexture, GL.Ext.FramebufferTextureFace, GL.Ext.FramebufferTextureLayer, GL.Ext.GetFramebufferAttachmentParameter
     /// </summary>
     public enum FramebufferTarget : int
     {